fixes for ch8
Merge pull request #31 from gAmUssA/master

fixes for ch8