Merge pull request #150 from EDiLD/dev_ms

Dev ms