Merge pull request #136 from EDiLD/dev_ms

revert additions in edisz-dev_ms_branch