Merge pull request #58 from gAmUssA/master

fixes in ch7