More cool stuff
Merge pull request #34 from GrahamCampbell/fixes

More Cool Stuff