Merge pull request #51 from daniellemayne/develop

Develop - added capabilities support
Reset storage endpoint to null on error
Merge pull request #53 from cafed00d/develop

Reset storage endpoint to null on error
Merge pull request #54 from daniellemayne/develop

Develop - fixed bugs found during testing