Fix for issue #733
Merge pull request #959 from rabe69/dev

Fix for issue #733