Merge pull request #43 from jfinkels/patch-1