Adding also value evaluation
Merge remote-tracking branch 'gextech/master'