Cleaning up
Merge branch 'master' of https://github.com/sparkica/zem-api-wrapper