Merge branch 'pagination'

Conflicts:
	README.md