final bug check
update Evaluator.java
Merge branch 'master' of https://github.com/calvinyu/WSE