cleanup
version bump
Merge branch 'release/0.0.22' into develop