Merge pull request #2 from rozaev/master

Chapter-03 fixes
chapter-04 added