Addresses issues mentioned in #29 (closed).
master
Closes #29 (closed)
No changes between mcq-fixes and version 3
