Merge remote-tracking branch 'origin/simple-pagination'

Conflicts:
	README.md