Fixes issue #8
Merge pull request #9 from PowerKiKi/issue-8

Fixes issue #8