Merge branch 'master' into develop
v. 0.5.2
Merge branch 'develop'