Fixed some mistakes for #552
Merge pull request #562 from JorWang/patch-4

Fixed some mistakes for #552
fixes and additions for the upcoming 4.1.0.f update
Translated recent changes

@Vexatos, please proofread this