Updated for elasticsearch 1.0.1