Fix for issue #114
Merge pull request #115 from pdehaan/master

Fix for issue #114