Merge pull request #7 from ben-utzer/patch-3