Merge pull request #284 from kpet/kp/tf-issues-295

Add support to indicate size and end of assembly functions