changed api calls to unlimited returns
Merge branch 'dev'