Refactored Paginator.
Merge branch 'pagination' into develop