Merge pull request #1 from KasenJ/master

更新
2014/7/17 by linhu
2014/7/17 bylinhu 2.0
Merge pull request #28 from linhu3/master

merge follow