Merge pull request #1 from wanby/master

pull from master
sd
Merge pull request #3 from wbyang1985/master

add