translated over: disylee <disylee@hotmail.com>
Merge pull request #1481 from disylee/master

translated over: disylee <disylee@hotmail.com>