commit for issue #45 and #60