Merge pull request #4 from Tybobobo/master

Thank you for your contributions. Sorry it took so long to merge, I've kind of fallen off the face of the planet recently.

Great work.