hao commit
Merge pull request #1 from hlac/master

hao commit