Merge pull request #85 from cweiske/patch-1