Fix pagination functionality. Close #34
Merge branch 'milestone-2' of https://github.com/jortal/Surferpedia into milestone-2