Merge branch 'master' into 2.2
Test and fix for #93
Merge branch '2.2'