M11
M10
Merge pull request #1 from xianglianmeng/master

Work from Xiangliang