Merge pull request #3 from gwtquery/mcm_fixes

done