Merge pull request #1 from mtiller/master

Adding multiple questions