multi-page question support
Merge remote-tracking branch 'upstream/master'
Merge pull request #174 from adamarla/master

Multi page question support