Merge branch 'develop'
bump version to 0.1.4
Merge branch 'release-0.1.4'