Reset bad commit
Merge branch 'master' of github.com:xoposhiy/trash
Necessary changes