Begin refactoring the paginator
Fixed pagination implementation
Merge remote-tracking branch 'origin/master' into topics/paginator
Pagination now implemented