Added dist management config
Merge branch 'dev'