翻译于2014/6/30
Merge pull request #57 from spacewander/master

翻译于2014/6/30