Merge pull request #15 from thomasmaurel/master

ok :) !