Merge pull request #319 from ideawu/master

merge master into dev
update README.md
Merge pull request #320 from ideawu/dev

Dev