Merge pull request #16 from adamvi/master

TCRP changes for EOCTs