Merge pull request #34 from louy2/patch-4