Four tests are passing :)
Merge branch 'master' into goodness
Merge pull request #17 from clottman/goodness

Goodness