fixes issue 3
Merge pull request #6 from ldrumm/issue3

fixes issue 3
Merge branch 'master' into issue5