Merge pull request #2 from zhanglingkang/master

update from LK
Merge pull request #4 from nealzhu/master

Merge pull request #2 from zhanglingkang/master