Merge pull request #38 from Caf131/master

Pull
Merge pull request #41 from Caf131/JDlux-master

Merge pull request #38 from Caf131/master