Merge pull request #1 from KuroFluff/master

Nearly identical