Fixed pagination issues. Closes #16.