Changes for release 0.2.1
Merge remote-tracking branch 'origin/release-0.2.1' into develop