Merge pull request #1 from ashenwolf/master

Update
Merge pull request #2 from mkclub/master

Merge pull request #1 from ashenwolf/master