Merge pull request #344 from nickavv/wigglybranch

Pagination Improvements