a few fixes
Merge pull request #3 from jimregan/patch-2

a few fixes