Develop

#577

Fixes issues with latest release of the API