Solved some problems
Merge branch 'master' of https://github.com/oybek/timus