Fixes #59 - Pagination added