Final changes for 0.2.0
Merge branch 'develop'