fixed issue #6
Merge pull request #21 from cmorganti/master

fixed issue #6