Merge pull request #69 from janpieper/patch-1