Merge pull request #431 from nhr/master

Fixed some handling logic for y/n/q/? questions.