full config
Merge pull request #1 from revington/full-config

full config