hello
Merge pull request #3 from zhao-yu/master

first merge