Merge pull request #1 from zxcvdavid/master

merge with demon
complete translate
Merge pull request #7 from wenjun1055/master

complete translate