Fix for issue #293
Merge pull request #298 from fdeberle/develop

Fix for issue #293