hehe
Merge pull request #22 from teynard/AdrienSecondBranch

hehe