fix #19 fix #18

fixing issues #18 and #19