improved m2h plugin