Merge pull request #68 from schwindp/patch-1