Merge branch 'master' into develop
Version 0.1.5