Issue 105

Fix for #105