#407
issue #274
2.2.1 release
Merge branch 'master' into develop