issue-21: closes #21
Merge pull request #23 from golyshevd/issue-21

issue-21: closes #21