Merge pull request #133 from EDiLD/dev_ms

Dev ms