Merge branch 'master' of https://github.com/jocisco/ml
updated ml.conf autodetection
Merge branch 'master' of https://github.com/jocisco/ml