Issue 75

Fix for issue #75