Merge pull request #32 from louy2/patch-2