diff --git a/elasticsearch/README.md b/elasticsearch/README.md
new file mode 100644
index 0000000000..e21070dbee
--- /dev/null
+++ b/elasticsearch/README.md
@@ -0,0 +1,6 @@
+=========
+
+## ElasticSearch
+
+### Relevant Articles: 
+- [A Guide to ElasticSearch](http://www.baeldung.com/????????)
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
new file mode 100644
index 0000000000..c12f258b98
--- /dev/null
+++ b/elasticsearch/pom.xml
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.baeldung</groupId>
+	<artifactId>elasticsearch</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>elasticsearch</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>2.3.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.13</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java b/elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java
new file mode 100644
index 0000000000..8f0b19a186
--- /dev/null
+++ b/elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java
@@ -0,0 +1,52 @@
+package com.baeldung.elasticsearch;
+
+import java.util.Date;
+
+public class Person {
+
+    private int age;
+
+    private String fullName;
+
+    private Date dateOfBirth;
+
+    public Person() {
+
+    }
+
+    public Person(int age, String fullName, Date dateOfBirth) {
+        super();
+        this.age = age;
+        this.fullName = fullName;
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public Date getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    public void setDateOfBirth(Date dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    @Override
+    public String toString() {
+        return "Person [age=" + age + ", fullName=" + fullName + ", dateOfBirth=" + dateOfBirth + "]";
+    }
+}
diff --git a/elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java b/elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java
new file mode 100644
index 0000000000..7121495e5a
--- /dev/null
+++ b/elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java
@@ -0,0 +1,134 @@
+package com.baeldung.elasticsearch;
+
+import static org.elasticsearch.node.NodeBuilder.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.elasticsearch.action.delete.DeleteResponse;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.node.Node;
+import org.elasticsearch.search.SearchHit;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.alibaba.fastjson.JSON;
+
+public class ElasticSearchUnitTests {
+    private List<Person> listOfPersons = new ArrayList<Person>();
+    String jsonString = null;
+    
+    Client client = null;
+
+    @Before
+    public void setUp() {
+        Person person1 = new Person(10, "John Doe", new Date());
+        Person person2 = new Person(25, "Janette Doe", new Date());
+        listOfPersons.add(person1);
+        listOfPersons.add(person2);
+        jsonString = JSON.toJSONString(listOfPersons);
+        Node node = nodeBuilder().clusterName("elasticsearch").client(true).node();
+        client = node.client();
+    }
+
+    @Test
+    public void givenJsonString_whenJavaObject_thenIndexDocument() {
+        String jsonObject = "{\"age\":20,\"dateOfBirth\":1471466076564,\"fullName\":\"John Doe\"}";
+        IndexResponse response = client.prepareIndex("people", "Doe")
+                .setSource(jsonObject).get();
+        String id = response.getId();
+        String index = response.getIndex();
+        String type = response.getType();
+        assertTrue(response.isCreated());
+        assertEquals(index, "people");
+        assertEquals(type, "Doe");
+    }
+    
+    @Test
+    public void givenDocumentId_whenJavaObject_thenDeleteDocument() {
+        String jsonObject = "{\"age\":10,\"dateOfBirth\":1471455886564,\"fullName\":\"Johan Doe\"}";
+        IndexResponse response = client.prepareIndex("people", "Doe")
+                .setSource(jsonObject).get();
+        String id = response.getId();
+        DeleteResponse deleteResponse = client.prepareDelete("people", "Doe", id).get();
+        assertTrue(deleteResponse.isFound());
+    }
+    
+    @Test
+    public void givenSearchRequest_whenMatchAll_thenReturnAllResults() {
+        SearchResponse response = client.prepareSearch().execute().actionGet();
+        SearchHit[] searchHits = response.getHits().getHits();
+        List<Person> results = new ArrayList<Person>();
+        for(SearchHit hit : searchHits){
+            String sourceAsString = hit.getSourceAsString();
+            Person person = JSON.parseObject(sourceAsString, Person.class);
+            results.add(person);
+        }
+    }
+    
+    @Test
+    public void givenSearchParamters_thenReturnResults() {
+        boolean isExecutedSuccessfully = true;
+        SearchResponse response = client.prepareSearch()
+                .setTypes()
+                .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+                .setPostFilter(QueryBuilders.rangeQuery("age").from(5).to(15))
+                .setFrom(0).setSize(60).setExplain(true)
+                .execute()
+                .actionGet();
+        
+        SearchResponse response2 = client.prepareSearch()
+                .setTypes()
+                .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+                .setPostFilter(QueryBuilders
+                        .simpleQueryStringQuery("+John -Doe OR Janette"))
+                .setFrom(0).setSize(60).setExplain(true)
+                .execute()
+                .actionGet();
+        
+        SearchResponse response3 = client.prepareSearch()
+                .setTypes()
+                .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+                .setPostFilter(QueryBuilders.matchQuery(
+                        "John", "Name*"))
+                .setFrom(0).setSize(60).setExplain(true)
+                .execute()
+                .actionGet();
+        try {
+            response2.getHits();
+            response3.getHits();
+            SearchHit[] searchHits = response.getHits().getHits();
+            List<Person> results = new ArrayList<Person>();
+            for(SearchHit hit : searchHits){
+                String sourceAsString = hit.getSourceAsString();
+                Person person = JSON.parseObject(sourceAsString, Person.class);
+                results.add(person);
+            }
+        } catch (Exception e) {
+            isExecutedSuccessfully = false;
+        }
+        assertTrue(isExecutedSuccessfully);
+    }
+    
+    @Test
+    public void givenContentBuilder_whenHelpers_thanIndexJson() throws IOException {
+        XContentBuilder builder = XContentFactory.jsonBuilder()
+                .startObject()
+                    .field("fullName", "Test")
+                    .field("salary", "11500")
+                    .field("age", "10")
+                .endObject();
+        IndexResponse response = client.prepareIndex("people", "Doe")
+                .setSource(builder).get();
+        assertTrue(response.isCreated());
+    }
+}