updates
Merge branch 'master' of https://github.com/dvargo/mm4
updates