#19 #20 - upgrade to ElasticSearch 0.90.0