Merge pull request #146 from EDiLD/dev_ms

Dev ms