Partial fix for Issues #10 & #8