Backported release 0.2.2 into develop
Version bump 0.2.2