Merge pull request #1073 from cjphaha/develop

Ftr: provide a default config