Merge pull request #6 from wellnessfx/development

Development
Merge branch 'master' of github.com:wellnessfx/emerald_api