Work done for #4
Closes #4
Moves to v2.2.0 + Upgrades dependencies