Fix for issue #105
Merge pull request #107 from mlorbetske/master

Fix for issue #105