refs task#10100 Change pagination
Merge pull request #57 from TrAnh/task#10100

refs task#10100 Change pagination