Version bump to 0.2.0
Merge branch 'development'