issue #6 resolved comments from pull request #7