Merge branch 'release/0.2' into development