Pull requests welcome

Untested, may explode
Merge pull request #1 from DoctorMcKay/patch-1

Pull requests welcome