Bump version for release
Merge branch 'release/0.1.21'
Merge tag '0.1.21' into develop

0.1.21