Jeff changes
Merge pull request #14 from Caf131/dev-doo-dah-cforehand

Jeff changes