Incorporating Daves fixes and aligning Paginator
Merge pull request #72 from daschl/paginator-fixes

Incorporating Daves fixes and aligning Paginator