Merge pull request #11 from clottman/goodness

Goodness
Nathan is sleepy...
Merge branch 'master' into goodness