Merge pull request #2 from LeRubisNoir/integration

Integration