more changes to support individual questions
Merge pull request #200 from adamarla/master

more changes to support individual questions