Merge branch 'release/1.0'
Update readme
Merge branch 'master' into develop