Merge pull request #60 from cwald/patch-1