updated features
Merge branch 'master' of https://github.com/msushkov/pa1-mt