diff --git a/lib/esqbuilder.js b/lib/esqbuilder.js
index a03c02b..46a4f2a 100644
--- a/lib/esqbuilder.js
+++ b/lib/esqbuilder.js
@@ -3,6 +3,8 @@
  * Copyright (c) 2014 Leonard Wu <leonard.wu92@alumni.ic.ac.uk>
  * https://github.com/leonardw/elasticsearch-query-builder
  * MIT Licensed
+ * 
+ * Customized: https://github.com/prasad83/elasticsearch-query-builder
  */
 (function () {
 	function hasWildcard(str) {
@@ -17,20 +19,22 @@
 		return str.replace(/([\+\-\&\|\!\(\)\{\}\[\]\^\"\~\:\/\\])/g, '\\$1');
 	}
 	
-	function addCriteria(qobj, criteria) {
+	function addCriteria(qobj, criteria, filterop) {
+		if (typeof filterop == 'undefined') filterop = 'and';
+		
 		if (!qobj.filter) {
 			qobj.filter = criteria;
-		} else if (!qobj.filter.and) {
+		} else if (!qobj.filter[filterop]) {
 			var arr = [];
 			arr.push(qobj.filter);
 			arr.push(criteria);
-			qobj.filter = {and : arr};
+			qobj.filter = {}; qobj.filter[filterop] = arr;
 		} else {
-			qobj.filter.and.push(criteria);
+			qobj.filter[filterop].push(criteria);
 		}
 	}
 	
-	function stringCriteria(src, qobj, prop) {
+	function stringCriteria(src, qobj, prop, filterop) {
 		if (src) {
 			var input = src.trim(),
 				len = input.length;
@@ -38,17 +42,28 @@
 				if (hasWildcard(src)) {
 					var wildcard = {};
 					wildcard[prop] = esEscape(src);
-					addCriteria(qobj, {query: {wildcard: wildcard}});
+					addCriteria(qobj, {query: {wildcard: wildcard}}, filterop);
 				} else {
 					var term = {};
 					term[prop] = unescWildcard(src);
-					addCriteria(qobj, {term: term});
+					addCriteria(qobj, {term: term}, filterop);
 				}
 			}
 		}
 	}
 	
-	function selectCriteria(src, qobj, prop) {
+	function wordsCriteria(words, qobj, prop, filterop) {
+		if (words.length) {
+			for (var i = 0, l = words.length; i < l; i++) {
+				words[i]= hasWildcard(words[i])? esEscape(words[i]) : unescWildcard(words[i]);
+			}
+			var term = {};
+			term[prop] = words;
+			addCriteria(qobj, {terms: term}, filterop);
+		}
+	}
+	
+	function selectCriteria(src, qobj, prop, filterop) {
 		var r = [];
 		for ( var key in src) {
 			if (src.hasOwnProperty(key) && src[key] === true) r.push(key);
@@ -56,16 +71,17 @@
 		var term = {};
 		if (r.length === 1) {
 			term[prop] = r[0];
-			addCriteria(qobj, {term: term});
+			addCriteria(qobj, {term: term}, filterop);
 		} else if (r.length > 1) {
 			term[prop] = r.sort();
-			addCriteria(qobj, {terms: term});
+			addCriteria(qobj, {terms: term}, filterop);
 		}
 	}
 	
 	var _me = {
 			stringCriteria: stringCriteria,
-			selectCriteria: selectCriteria
+			selectCriteria: selectCriteria,
+			wordsCriteria : wordsCriteria
 		};
 	
 	if (typeof module !== 'undefined' && module.exports) {