Update to m3
Merge pull request #371 from rashidkpc/upstream

Update to m3