Merge pull request #16 from clottman/goodness

Goodness
Four tests are passing :)
Merge branch 'master' into goodness