Merge branch '1.1.0-wip'
updated readme
updated readme
Merge branch 'master' into 1.1.0-wip