Switching to tag 0.2.0
Merge branch 'tag-0.2' into development