Fixes #567 - removes paginator.
Merge pull request #568 from PaulKinlan/master

Fixes #567 - removes paginator.