Fixed issue #40
Merge pull request #48 from BernhardBerbuir/master

Fixed issue #40