Merge pull request #35 from zyuce/master

提交code0427
提交0428