refs #1524 add $M
Merge branch 'master' of https://github.com/akouryy/hawaii