Merge pull request #29 from Caf131/JDlux-master

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

Merge pull request #29 from Caf131/JDlux-master