Merge pull request #1 from jie414341055/master

update toj