Fixed MCM issues, resolving issues #32 and #33.