Merge pull request #3755 from CyrusBiotechnology/bfrenz/hybrid_add_hetatm_setter Bfrenz/hybrid add hetatm setter