added some new features
branch 'master' of https://github.comushkov/pa1-mt