revert to commit 8255c6e703cdc77add82320dff6499e7a039e139
Merge pull request #9 from robertzk/eval_final

revert to commit 8255c6e703cdc77add82320dff6499e7a039e139