Merge pull request #5 from jeremybanks/mso-to-mse

Handles replacement of MSO with MSE
clean
.
clean