added some more default config
added more line length
Merge branch 'master' into resource