Merge branch 'master' into develop
Updated readme and style.css for version changes
Merge branch 'release/2.2.1'