Merge pull request #120 from vermiculus/reorganize-question-mode

Reorganize question mode
Merge branch 'master' into organize