Merge pull request #7 from gAmUssA/master

bunch of changes of ch6, ch7 and etc