Merge pull request #2 from LeRubisNoir/integration

Integration
Merge pull request #7 from LeRubisNoir/master

Merge pull request #2 from LeRubisNoir/integration