Merge pull request #2 from zhanglingkang/master

update from LK