First commit
Merge pull request #1 from empmike/Calvin

First commit