Closes #197
Merge branch '2.2'