jwbober Merge pull request #7 from fchapoton/patch-1 …