Fix for issue #106
Merge pull request #109 from mlorbetske/master

Fix for issue #106