sturobson Merge pull request #10 from gpoussel/patch-1