Merge pull request #11 from hsarret/master

Stuffs ;)