added M2k to the solution
Merge branch 'master' of https://github.com/mibarra/miq