Merge pull request #233 from hnyman/m-fix