Issue 05

Also fixes issue 6