Merge branch 'release/1.1' into develop
Merge branch 'master' into develop
Updated to be composable.
Corrected version information in README