Add pagination which closes #2