new config system
Merge branch 'dev'