resolved merge conflict
Merge pull request #409 from stowellm/ms400

I don't suck I swear