Fixes issue #2
Merge branch 'issue-2'