Changes made by Jeremy Tomasi (jeremy@netkin.fr).
Merge branch 'master' of https://github.com/jeremynetkin/test.git