update
Merge pull request #280 from ideawu/dev

update
Merge pull request #281 from ideawu/master

merge master