Issue 9

Should resolve #9