fixes in ch7
Merge pull request #56 from gAmUssA/master

fixes in ch7