Updated version
Merge branch 'release-0.2'