Restore compatibility with MFR, fixes #86
Merge pull request #89 from samrg472/master

Restore compatibility with MFR, fixes #86