my new branch
Merge pull request #1 from megastarxs/newmj

my new branch