problem 1222
Merge branch 'master' of github.com:stp-che/timus