Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Updated version to 1.1
Merge branch 'release'