Merge pull request #163 from cloudswei/ctlframe_injection