Merge pull request #30 from domurtag/master

fix for issue #26
changes in response to discussion of issue #31