Use paginator. Fixes issue #33