Merge pull request #3 from TheChronicMonster/edit

Edit
Merge pull request #4 from TheChronicMonster/master

Merge pull request #3 from TheChronicMonster/edit