Merge pull request #1 from dawnuria/master

Mod