Merge pull request #5 from spotwise/master

Merge pull request #4 from spotwise/develop
Merge branch 'develop'