Merge branch 'release/v0.22'
Merge tag 'v0.22' into develop

Enhanced close #20