fix for Issues #9 & #10