Possibly fixed travis build
Second attempt
Merge branch 'master' into develop
update query to support paging
queries now support pagination