A version of Hudon's MS that compiles on Mavericks