Merge pull request #115 from gAmUssA/master

ch 8: small fixes
ch6: refactored code sample, addressed reviewers issues