Merge pull request #488 from ideawu/master

master into dev
update
update
udpate
refactor codes
udpate
update
update
update
update
udpate
update
update
update
update
update
update
udpate
update
update