Merge branch 'hotfix/172'

Close #172
Merge branch 'hotfix/196'

Close #196
[#190] Allow -1 as page_size value

- Allows -1 as a page size value, to allow disabling pagination.
Merge branch 'hotfix/190' into develop

Forward port #190