Merge pull request #84 from ldionne/patch-1