Fixes
Fixing conf
Merge pull request #8 from mistercrunch/fixes

Fixes