Merge branch 'master' into develop
Bump version to 0.0.1.4
Merge branch 'develop'