Nathan is sleepy...
Merge branch 'master' into goodness
Merge pull request #12 from clottman/goodness

Goodness