Merge pull request #107 from p-l-/fix-hfmf