DRY thanks to @ceeram
Merge pull request #7 from WyriHaximus/master

DRY thanks to @ceeram