darold Merge pull request #2 from tpoindessous/patch-1