Merge pull request #1 from yingjieMiao/master

first commit