Fixes
Merge pull request #1 from woodne/master

Fixe stuff