fuck you antoine
Merge pull request #2 from VoiiD/chris

first commit from chris