2nd edition, fix the issues#4 #5 and #7
Merge pull request #8 from barbagroup/2ndED

2nd edition, fix the issues #4 #5 and #7