Release 2.2.0

Fixes #36  
Fixes #37  
Merges version 2.2.0 milestones and fixes into master ready for tagging and release.