Merge branch 'hotfix/v0.0.1-2' into develop
Updated travis build config, updated documentation
Updated whitespace in api.md
Merge branch 'develop'