#89 Refactoring Pageable
Merge branch 'enhancement89' into 0.2.0-update