issue-21: closes #21