Fix
Version 0.2.2
Merge branch 'release/v0.2.2' into develop