Adding more logic to be evaluator.
Merge branch 'master' of github.com:Curtor/Curtor.github.io