Merge branch 'release/0.1.4' into develop
Merge remote-tracking branch 'origin/develop'