resolved  #19 and resolved #1