Merge pull request #149 from EDiLD/dev_ms

Dev ms