Merge pull request #1 from Lord-Simon/master

Updates
Merge pull request #12 from Baka-Tsuki/master

Merge pull request #1 from Lord-Simon/master