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

Merge pull request #34 from Caf131/master
Merge pull request #36 from Caf131/master

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