Fixes #108

Fix for issue #108