simplify codes
Merge pull request #61 from liuweifly/master

Merge刘苇任务5