Updating to latest M3 editor release
Merge pull request #8 from donny-dont/master

Fixes for latest M3 editor.