closed #26
Merge branch 'issue-26'