Restore compatibility with MFR
Merge pull request #216 from samrg472/master

Restore compatibility with MFR