Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
all parameter insert to param for evaluator
Merge pull request #15 from jogie/fix-evaluator

Fix evaluator