Fix for bug #85
Merge pull request #92 from wnagele/master

Fix for #85