Fixes issue #1
Merge pull request #2 from matthew-shaw/bug-fix

Fixes issue #1