Now MSM-compatible
Merge pull request #2 from cherrypj/master

MSM-compatible