Merge pull request #5 from twotoasters/carlton-dev

Addresses #4
Merge branch 'master' into carlton-dev