issue-71
issue-71, code changes after review