Fixes #5.
Merge pull request #6 from frmwrk123/fix/pageNumber

Fixes #5.
Prepare for beta 3.
Merge pull request #7 from frmwrk123/prepare/beta3

Prepare for beta 3.
Merge branch 'dev'