Synched changes for #83 with ml.bat