Update m2e to support m2e 1.5
Merge pull request #44 from rtack/support_m2e_1.5

Update m2e to support m2e 1.5