Updates for ML

[jflalonde]

Hi Iromu,

Here's the pull request for my updates. I'm still not able to get the app fully working yet, but hope this is one more step in the right direction.

Thanks for putting this together, definitely very useful!

JF