Merges branch 'release/0.1.21' into develop
Upgrades to riml 0.3.3
Bumps version to 0.1.22
Merges branch 'release/0.1.22'