Recover of some lost chap 5 code
Merge pull request #3 from bacoon23/master2

Recover of some lost chap 5 code