fixed shit
Merge pull request #372 from mentatzoe/master

fixed shit ch2