Merge pull request #6 from dtatut/patch-1