Merge pull request #137 from erichs/fix_136

fix for issue #136