benoitc Merge pull request #21 from coulix/patch-1