Reconciled v11 with Ed's v11.
Merge branch 'master' of git@github.com:hunterhector/EvmEval.git