Merge pull request #137 from gutknecht/patch-1