merge issues for issue #7 fixed.