Issue 5

Fix for #5