fix everything
Merge branch 'master' of https://github.com/onovikov/qa
hi