One last commit?
Merge pull request #21 from jabaldwin/master

One last commit?