Merge pull request #264 from fsb4000/mxe