Merge branch 'develop' into master - v0.2.2