Merge pull request #4 from horzwxy/master

pull