Fix to issue #418
Merge pull request #419 from lring/develop

Fix to issue #418