Merge branch 'release-2.1' into dev
Merge branch 'master' into dev
Updated version number and readme
Merge branch 'release-2.2'