Merge pull request #7 from jixiangye/master

update
update todo
Merge pull request #13 from colorpeach/master

update todo