Merge pull request #2 from mingyang91/master

啊