Fixing esprima fixes. close #332