Fix Pagination
Merge branch 'master' of https://github.com/muchaweb/EGS