Merging master

sorry for the branch name, but this is the pagination stuff