Merge pull request #328 from Ippo343/master

Updates CLS to depend on MM