Merge pull request #778 from vito-L/master

Translated
This commit is contained in:
Vito
2014-02-23 20:23:11 +08:00