diff --git a/angucomplete.js b/angucomplete.js
index 7a42bf0..9d5f067 100644
--- a/angucomplete.js
+++ b/angucomplete.js
@@ -1,3 +1,7 @@
+/**
+ * Modified by Ahsan-KoderLabs on 1/20/2015.
+ */
+
 /**
  * Angucomplete
  * Autocomplete directive for AngularJS
@@ -6,110 +10,111 @@
 
 angular.module('angucomplete', [] )
     .directive('angucomplete', function ($parse, $http, $sce, $timeout) {
-    return {
-        restrict: 'EA',
-        scope: {
-            "id": "@id",
-            "placeholder": "@placeholder",
-            "selectedObject": "=selectedobject",
-            "url": "@url",
-            "dataField": "@datafield",
-            "titleField": "@titlefield",
-            "descriptionField": "@descriptionfield",
-            "imageField": "@imagefield",
-            "imageUri": "@imageuri",
-            "inputClass": "@inputclass",
-            "userPause": "@pause",
-            "localData": "=localdata",
-            "searchFields": "@searchfields",
-            "minLengthUser": "@minlength",
-            "matchClass": "@matchclass"
-        },
-        template: '<div class="angucomplete-holder"><input id="{{id}}_value" ng-model="searchStr" type="text" placeholder="{{placeholder}}" class="{{inputClass}}" onmouseup="this.select();" ng-focus="resetHideResults()" ng-blur="hideResults()" /><div id="{{id}}_dropdown" class="angucomplete-dropdown" ng-if="showDropdown"><div class="angucomplete-searching" ng-show="searching">Searching...</div><div class="angucomplete-searching" ng-show="!searching && (!results || results.length == 0)">No results found</div><div class="angucomplete-row" ng-repeat="result in results" ng-click="selectResult(result)" ng-mouseover="hoverRow()" ng-class="{\'angucomplete-selected-row\': $index == currentIndex}"><div ng-if="imageField" class="angucomplete-image-holder"><img ng-if="result.image && result.image != \'\'" ng-src="{{result.image}}" class="angucomplete-image"/><div ng-if="!result.image && result.image != \'\'" class="angucomplete-image-default"></div></div><div class="angucomplete-title" ng-if="matchClass" ng-bind-html="result.title"></div><div class="angucomplete-title" ng-if="!matchClass">{{ result.title }}</div><div ng-if="result.description && result.description != \'\'" class="angucomplete-description">{{result.description}}</div></div></div></div>',
-
-        link: function($scope, elem, attrs) {
-            $scope.lastSearchTerm = null;
-            $scope.currentIndex = null;
-            $scope.justChanged = false;
-            $scope.searchTimer = null;
-            $scope.hideTimer = null;
-            $scope.searching = false;
-            $scope.pause = 500;
-            $scope.minLength = 3;
-            $scope.searchStr = null;
-
-            if ($scope.minLengthUser && $scope.minLengthUser != "") {
-                $scope.minLength = $scope.minLengthUser;
-            }
+        return {
+            restrict: 'EA',
+            scope: {
+                "id": "@id",
+                "placeholder": "@placeholder",
+                "selectedObject": "=selectedobject",
+                "onChangeFunction":"=onchangefunction",
+                "url": "@url",
+                "dataField": "@datafield",
+                "titleField": "@titlefield",
+                "descriptionField": "@descriptionfield",
+                "imageField": "@imagefield",
+                "imageUri": "@imageuri",
+                "inputClass": "@inputclass",
+                "userPause": "@pause",
+                "localData": "=localdata",
+                "searchFields": "@searchfields",
+                "minLengthUser": "@minlength",
+                "matchClass": "@matchclass",
+                "promiseFunction": "=promisefunction"
+            },
+            template: '<div class="angucomplete-holder"><input id="{{id}}_value" ng-model="searchStr" type="text" placeholder="{{placeholder}}" class="{{inputClass}}" onmouseup="this.select();" ng-focus="resetHideResults()" ng-blur="hideResults()" /><div id="{{id}}_dropdown" class="angucomplete-dropdown" ng-if="showDropdown"><div class="angucomplete-searching" ng-show="searching">Searching...</div><div class="angucomplete-searching" ng-show="!searching && (!results || results.length == 0)">No results found</div><div class="angucomplete-row" ng-repeat="result in results" ng-click="selectResult(result)" ng-mouseover="hoverRow()" ng-class="{\'angucomplete-selected-row\': $index == currentIndex}"><div ng-if="imageField" class="angucomplete-image-holder"><img ng-if="result.image && result.image != \'\'" ng-src="{{result.image}}" class="angucomplete-image"/><div ng-if="!result.image && result.image != \'\'" class="angucomplete-image-default"></div></div><div class="angucomplete-title" ng-if="matchClass" ng-bind-html="result.title"></div><div class="angucomplete-title" ng-if="!matchClass">{{ result.title }}</div><div ng-if="result.description && result.description != \'\'" class="angucomplete-description">{{result.description}}</div></div></div></div>',
+
+            link: function($scope, elem, attrs) {
+                $scope.lastSearchTerm = null;
+                $scope.currentIndex = null;
+                $scope.justChanged = false;
+                $scope.searchTimer = null;
+                $scope.hideTimer = null;
+                $scope.searching = false;
+                $scope.pause = 500;
+                $scope.minLength = 3;
+                $scope.searchStr = null;
+
+                if ($scope.minLengthUser && $scope.minLengthUser != "") {
+                    $scope.minLength = $scope.minLengthUser;
+                }
 
-            if ($scope.userPause) {
-                $scope.pause = $scope.userPause;
-            }
+                if ($scope.userPause) {
+                    $scope.pause = $scope.userPause;
+                }
 
-            isNewSearchNeeded = function(newTerm, oldTerm) {
-                return newTerm.length >= $scope.minLength && newTerm != oldTerm
-            }
+                var isNewSearchNeeded = function(newTerm, oldTerm) {
+                    return newTerm.length >= $scope.minLength && newTerm != oldTerm
+                };
 
-            $scope.processResults = function(responseData, str) {
-                if (responseData && responseData.length > 0) {
-                    $scope.results = [];
+                $scope.processResults = function(responseData, str) {
+                    if (responseData && responseData.length > 0) {
+                        $scope.results = [];
 
-                    var titleFields = [];
-                    if ($scope.titleField && $scope.titleField != "") {
-                        titleFields = $scope.titleField.split(",");
-                    }
+                        var titleFields = [];
+                        if ($scope.titleField && $scope.titleField != "") {
+                            titleFields = $scope.titleField.split(",");
+                        }
 
-                    for (var i = 0; i < responseData.length; i++) {
-                        // Get title variables
-                        var titleCode = [];
+                        for (var i = 0; i < responseData.length; i++) {
+                            // Get title variables
+                            var titleCode = [];
 
-                        for (var t = 0; t < titleFields.length; t++) {
-                            titleCode.push(responseData[i][titleFields[t]]);
-                        }
+                            for (var t = 0; t < titleFields.length; t++) {
+                                titleCode.push(responseData[i][titleFields[t]]);
+                            }
 
-                        var description = "";
-                        if ($scope.descriptionField) {
-                            description = responseData[i][$scope.descriptionField];
-                        }
+                            var description = "";
+                            if ($scope.descriptionField) {
+                                description = responseData[i][$scope.descriptionField];
+                            }
 
-                        var imageUri = "";
-                        if ($scope.imageUri) {
-                            imageUri = $scope.imageUri;
-                        }
+                            var imageUri = "";
+                            if ($scope.imageUri) {
+                                imageUri = $scope.imageUri;
+                            }
 
-                        var image = "";
-                        if ($scope.imageField) {
-                            image = imageUri + responseData[i][$scope.imageField];
-                        }
+                            var image = "";
+                            if ($scope.imageField) {
+                                image = imageUri + responseData[i][$scope.imageField];
+                            }
 
-                        var text = titleCode.join(' ');
-                        if ($scope.matchClass) {
-                            var re = new RegExp(str, 'i');
-                            var strPart = text.match(re)[0];
-                            text = $sce.trustAsHtml(text.replace(re, '<span class="'+ $scope.matchClass +'">'+ strPart +'</span>'));
-                        }
+                            var text = titleCode.join(' ');
+                            if ($scope.matchClass) {
+                                var re = new RegExp(str, 'i');
+                                var strPart = text.match(re)[0];
+                                text = $sce.trustAsHtml(text.replace(re, '<span class="'+ $scope.matchClass +'">'+ strPart +'</span>'));
+                            }
 
-                        var resultRow = {
-                            title: text,
-                            description: description,
-                            image: image,
-                            originalObject: responseData[i]
-                        }
+                            var resultRow = {
+                                title: text,
+                                description: description,
+                                image: image,
+                                originalObject: responseData[i]
+                            };
 
-                        $scope.results[$scope.results.length] = resultRow;
-                    }
+                            $scope.results[$scope.results.length] = resultRow;
+                        }
 
 
-                } else {
-                    $scope.results = [];
+                    } else {
+                        $scope.results = [];
+                    }
                 }
-            }
-
-            $scope.searchTimerComplete = function(str) {
-                // Begin the search
 
-                if (str.length >= $scope.minLength) {
-                    if ($scope.localData) {
+                $scope.searchTimerComplete = function(str) {
+                    // Begin the search
+                    var searchLocal = function(data){
+                        if(data) $scope.localData = data;
                         var searchFields = $scope.searchFields.split(",");
 
                         var matches = [];
@@ -128,8 +133,9 @@ angular.module('angucomplete', [] )
 
                         $scope.searching = false;
                         $scope.processResults(matches, str);
+                    };
 
-                    } else {
+                    var getFromURL = function(){
                         $http.get($scope.url + str, {}).
                             success(function(responseData, status, headers, config) {
                                 $scope.searching = false;
@@ -138,109 +144,131 @@ angular.module('angucomplete', [] )
                             error(function(data, status, headers, config) {
                                 console.log("error");
                             });
+                    };
+                    if (str.length >= $scope.minLength) {
+                        if($scope.localData) {                                                                  // if the search is to be done from a localData
+                            if($scope.promiseFunction){                                                         // if the localData is gathered from a http call not of the form "url?s=", based on the query of angucomplete input's value
+                                $scope.promiseFunction(angular.copy($scope.searchStr)).then(function(data){     //send the searchStr to promiseFunc to query the serve
+                                    searchLocal(data);                                                          //now search from the data that's returned after the query
+                                });
+                            }
+                            else{
+                                searchLocal();
+                            }
+                        } else {
+                            getFromURL();
+                        }
+
                     }
-                }
-            }
+                };
 
-            $scope.hideResults = function() {
-                $scope.hideTimer = $timeout(function() {
-                    $scope.showDropdown = false;
-                }, $scope.pause);
-            };
+                $scope.hideResults = function() {
+                    $scope.hideTimer = $timeout(function() {
+                        $scope.showDropdown = false;
+                    }, $scope.pause);
+                };
 
-            $scope.resetHideResults = function() {
-                if($scope.hideTimer) {
-                    $timeout.cancel($scope.hideTimer);
+                $scope.resetHideResults = function() {
+                    if($scope.hideTimer) {
+                        $timeout.cancel($scope.hideTimer);
+                    }
                 };
-            };
 
-            $scope.hoverRow = function(index) {
-                $scope.currentIndex = index;
-            }
+                $scope.hoverRow = function(index) {
+                    $scope.currentIndex = index;
+                };
 
-            $scope.keyPressed = function(event) {
-                if (!(event.which == 38 || event.which == 40 || event.which == 13)) {
-                    if (!$scope.searchStr || $scope.searchStr == "") {
-                        $scope.showDropdown = false;
-                        $scope.lastSearchTerm = null
-                    } else if (isNewSearchNeeded($scope.searchStr, $scope.lastSearchTerm)) {
-                        $scope.lastSearchTerm = $scope.searchStr
-                        $scope.showDropdown = true;
-                        $scope.currentIndex = -1;
-                        $scope.results = [];
+                $scope.keyPressed = function(event) {
+                    if (!(event.which == 38 || event.which == 40 || event.which == 13)) {
+                        if (!$scope.searchStr || $scope.searchStr == "") {
+                            $scope.showDropdown = false;
+                            $scope.lastSearchTerm = null
+                        } else if (isNewSearchNeeded($scope.searchStr, $scope.lastSearchTerm)) {
+                            $scope.lastSearchTerm = $scope.searchStr;
+                            $scope.showDropdown = true;
+                            $scope.currentIndex = -1;
+                            $scope.results = [];
+
+                            if ($scope.searchTimer) {
+                                $timeout.cancel($scope.searchTimer);
+                            }
 
-                        if ($scope.searchTimer) {
-                            $timeout.cancel($scope.searchTimer);
-                        }
+                            $scope.searching = true;
 
-                        $scope.searching = true;
+                            $scope.searchTimer = $timeout(function() {
+                                $scope.searchTimerComplete($scope.searchStr);
+                            }, $scope.pause);
+                        }
+                    } else {
+                        event.preventDefault();
+                    }
+                    if($scope.searchStr==""){
+                        $scope.selectedObject = {};
+                        if($scope.onChangeFunction){
+                            $scope.onChangeFunction(null);
+                        }
+                    }
+                };
 
-                        $scope.searchTimer = $timeout(function() {
-                            $scope.searchTimerComplete($scope.searchStr);
-                        }, $scope.pause);
+                $scope.selectResult = function(result) {
+                    if ($scope.matchClass) {
+                        result.title = result.title.toString().replace(/(<([^>]+)>)/ig, '');
                     }
-                } else {
-                    event.preventDefault();
-                }
-            }
+                    $scope.searchStr = $scope.lastSearchTerm = result.title;
+                    $scope.selectedObject = result;
+                    $scope.showDropdown = false;
+                    $scope.results = [];
+                    if($scope.onChangeFunction){
+                        $scope.onChangeFunction(result);
+                    }
+                    //$scope.$apply();
+                };
 
-            $scope.selectResult = function(result) {
-                if ($scope.matchClass) {
-                    result.title = result.title.toString().replace(/(<([^>]+)>)/ig, '');
-                }
-                $scope.searchStr = $scope.lastSearchTerm = result.title;
-                $scope.selectedObject = result;
-                $scope.showDropdown = false;
-                $scope.results = [];
-                //$scope.$apply();
-            }
+                var inputField = elem.find('input');
 
-            var inputField = elem.find('input');
+                inputField.on('keyup', $scope.keyPressed);
 
-            inputField.on('keyup', $scope.keyPressed);
+                elem.on("keyup", function (event) {
+                    if(event.which === 40) {
+                        if ($scope.results && ($scope.currentIndex + 1) < $scope.results.length) {
+                            $scope.currentIndex ++;
+                            $scope.$apply();
+                            event.preventDefault();
+                            event.stopPropagation();
+                        }
 
-            elem.on("keyup", function (event) {
-                if(event.which === 40) {
-                    if ($scope.results && ($scope.currentIndex + 1) < $scope.results.length) {
-                        $scope.currentIndex ++;
                         $scope.$apply();
-                        event.preventDefault;
-                        event.stopPropagation();
-                    }
+                    } else if(event.which == 38) {
+                        if ($scope.currentIndex >= 1) {
+                            $scope.currentIndex --;
+                            $scope.$apply();
+                            event.preventDefault();
+                            event.stopPropagation();
+                        }
 
-                    $scope.$apply();
-                } else if(event.which == 38) {
-                    if ($scope.currentIndex >= 1) {
-                        $scope.currentIndex --;
-                        $scope.$apply();
-                        event.preventDefault;
-                        event.stopPropagation();
-                    }
+                    } else if (event.which == 13) {
+                        if ($scope.results && $scope.currentIndex >= 0 && $scope.currentIndex < $scope.results.length) {
+                            $scope.selectResult($scope.results[$scope.currentIndex]);
+                            $scope.$apply();
+                            event.preventDefault();
+                            event.stopPropagation();
+                        } else {
+                            $scope.results = [];
+                            $scope.$apply();
+                            event.preventDefault();
+                            event.stopPropagation();
+                        }
 
-                } else if (event.which == 13) {
-                    if ($scope.results && $scope.currentIndex >= 0 && $scope.currentIndex < $scope.results.length) {
-                        $scope.selectResult($scope.results[$scope.currentIndex]);
-                        $scope.$apply();
-                        event.preventDefault;
-                        event.stopPropagation();
-                    } else {
+                    } else if (event.which == 27) {
                         $scope.results = [];
+                        $scope.showDropdown = false;
+                        $scope.$apply();
+                    } else if (event.which == 8) {
+                        $scope.selectedObject = null;
                         $scope.$apply();
-                        event.preventDefault;
-                        event.stopPropagation();
                     }
+                });
 
-                } else if (event.which == 27) {
-                    $scope.results = [];
-                    $scope.showDropdown = false;
-                    $scope.$apply();
-                } else if (event.which == 8) {
-                    $scope.selectedObject = null;
-                    $scope.$apply();
-                }
-            });
-
-        }
-    };
-});
-
+            }
+        };
+    });