Merge pull request #364 from hmcq6/HM_Field_Check

Hm field check