Issue 76

Fix for issue #76