amendments to get #54 fix working
Merge pull request #56 from jule64/master

amendments to get #54 fix working