Merge pull request #5 from gouwestadmm/master

Update MM fork
Merge pull request #2 from Progroep/master

Update MM fork