Pagination updated, and page_view has been added (page/x).
Merge remote-tracking branch 'origin/master'