Merge branch 'release-0.1'
Updated to version 0.2
Merge branch 'release-0.2'
Merge branch 'master' into develop