fixes #6
Merge branch 'issue-6'