Small fixes
Merge pull request #185 from jaytaph/config2

Small fixes