Update MM to 2.5.4
Merge pull request #82 from Felger/master

Update MM to 2.5.4