Changed to milestone 0.1.4
Merge branch 'release-0.1.4' into develop