Merge pull request #1 from SnowCold/master

merge