issues #19 fixed