commit for issue #37 , #41