rewrite and retranslate 5.2.5
Merge pull request #1 from phasetr/sec-5.2.5