Try this again, less files?
Merge pull request #6 from thomasphorton/master

One more time?