Merge pull request #3 from Caf131/master

Merge
Merge pull request #44 from JDlux/dev-doo-dah-cforehand

Merge pull request #3 from Caf131/master