Fix for issue #119
Merge pull request #120 from xeon22/develop

Fix for issue #119