Merge pull request #33 from Caf131/dev-doo-dah-cforehand

Merge pull request #32 from Caf131/master