dchest Merge pull request #7 from bcomnes/patch-1 …