Fixes
Merge pull request #1 from bmneely/fixes

Fixes