hao123
Merge pull request #2 from yaodream/master

hao123