Fix more config issues
Merge pull request #12 from JonnyHonda/v1.0

Fix more config issues