Closes #236 pagination fixed
Merge pull request #791 from Tendrid/develop

Closes #236 pagination fixed