Merge pull request #5 from clottman/goodness

Goodness
Nathan is stupid
Merge branch 'master' into goodness