Improvements and upgrade to Elasticsearch 1.4.0