Update ES 0.90.0 - feature #2
Fix unit test