MJ support
Merge pull request #80 from AsiePack/master

MJ support