Merge pull request #3 from TheChronicMonster/edit

Edit