Issue 36

Fix for #36