changelog updated
Merge branch 'release-0.1.4' into develop