fixed bugs in expression
Merge branch 'master' of https://github.com/MagicTowerTHU/MagicTower