fixes #1
Merge branch 'issue-1'