Fixes #3
Merge branch 'bugfix-issue-3'