Fixed MC bug; Almost finished HIMM
Merge branch 'master' of https://github.com/jpritt/glimmer