fix #22
Merge branch 'release/v0.1.22'