fixed issues #19 #17 #11