Merge pull request #174 from adamarla/master

Multi page question support
reverted change made in prior commit
Merge remote-tracking branch 'upstream/master'