Merge branch 'refs/heads/master' into release
Updated readme
Merge branch 'refs/heads/release'