fixed issue #8
Merge pull request #17 from goosowen/master

fixed issue #8, again