Merge pull request #1 from KuroFluff/master

Nearly identical
Merge pull request #2 from KuroFluff/second

Merge pull request #1 from KuroFluff/master