seperated config from base controller
Merge branch 'dev'