Merge pull request #42 from Caf131/master

merge
Merge pull request #2 from Caf131/master

pull request
Merge pull request #43 from JDlux/JDlux-master

Merge pull request #2 from Caf131/master
Changes
Merge pull request #46 from Caf131/JDlux-master

J dlux master