Merge branch 'master' of https://github.com/jocisco/mldeploy

Conflicts:
	mldeploy
Merge branch 'master' of https://github.com/jocisco/mldeploy