Edit by Essolo
Merge pull request #20 from essolo/mzm2

Edit by Essole
update