support ms

support ms
Merge pull request #2 from thinkboy/master

support ms