Revert Breno's reversion. Grr
Release v2.2.0