changes for release 0.2
Merge branch 'release-0.2' into develop