commit for issue #60 and #45