ISSUE: #7
closes #7