Merge pull request #105 from Minrog/master

2.04.0:minrog:7 Fix for issue #86