Merge branch 'development' into release-0.1.0