Update

Pushed to master at chimo/gs-elasticsearch