commit for issue #32 and  #31
commit for issue #32 and  #31