backporting bugfix
fix on pagination
Merge branch 'master/0.2' into master/chiba