Merge branch 'master' into dev
update dist
Merge branch 'dev'
update README.md