Merge pull request #2 from SnowCold/master

merge