Merge branch 'origin/dev'
Change version to 0.2