minor changes for pull
Merge branch 'master' of https://github.com/gadeweever/toufuu-project.git