Fix for bug #347
Merge pull request #360 from godarklight/master

Fix for bug #347