issues #9 and #10 fixed

thanks to haoap.