fixed an error
Merge branch 'master' of https://github.com/sunheng/M2