Merge pull request #2 from darknesswind/master

merge