Moar things
Merge pull request #4 from ben3005/patch-2

Moar things