updated Operator API, and included Javascript evaluation operator
update
Merge origin/master