Changes for release 0.2.2
Merge remote-tracking branch 'origin/release-0.2.2'