Version 2.2

Closes #3