Update to ES 1.0.0
Merge remote-tracking branch 'origin/master'
merged upgrade to ES 1.0.0