Merge pull request #105 from Foblex/update-to-new-m-render

Merge pull request #105 from Foblex/update-to-new-m-render #230