Aded in config.yml.base to make deployment easier
Merge branch 'master' into windows