Fixed pagination
Merge pull request #107 from isflorin/dev

Fixed pagination