CalvinsCommit
Merge pull request #2 from themorgs/master

oh that's much better......