Fixed issue #238
Merge pull request #239 from umby24/master

Fixed issue #238