Merge pull request #2 from Caf131/master

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

Merge pull request #2 from Caf131/master