Merge pull request #2 from tyu1/YTY

Yutianyu update: 16 Oct