fixes  #13, #14 #10
fixes #14, #10