update
Merge pull request #2 from hxwang/master

merge