update
update
Merge pull request #342 from ideawu/dev

Dev
Merge pull request #343 from ideawu/master

merge master