Added Tuan's Revision to TuanBranch

I would like to merge these two branches.