Merge pull request #135 from marketboomer/ratjens

put back form_heading generalisation, lost in a merge somewhere