Merge pull request #31 from Caf131/JDlux-master

Merge pull request #30 from Caf131/master
Merge pull request #32 from Caf131/master

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

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

Merge pull request #33 from Caf131/dev-doo-dah-cforehand
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
Merge pull request #37 from Caf131/dev-doo-dah-cforehand

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

Pull