Restructe end evaluation
Merge branch 'master' of https://github.com/ch3ck3r/mathetest