Merge pull request #113 from ericvincenterv/pagination

fix #112
Merge pull request #114 from InnovaLangues/pagination

Pagination
Merge remote-tracking branch 'upstream/master'