Adding pagination. Close #4