Refactoring pagination
Merge pull request #17 from jespino/refactoring-pagination

Refactoring pagination