update
Merge pull request #349 from ideawu/dev

update