diff --git a/dist/vs-google-autocomplete.js b/dist/vs-google-autocomplete.js
index d026bd8..0709a3b 100644
--- a/dist/vs-google-autocomplete.js
+++ b/dist/vs-google-autocomplete.js
@@ -1,7 +1,7 @@
 /**
- * vsGoogleAutocomplete - v0.5.0 - 2015-11-29
+ * vsGoogleAutocomplete - v0.5.0 - 2016-04-26
  * https://github.com/vskosp/vsGoogleAutocomplete
- * Copyright (c) 2015 K.Polishchuk
+ * Copyright (c) 2016 K.Polishchuk
  * License: MIT
  */
 (function (window, document) {
@@ -181,6 +181,15 @@ angular.module('vsGoogleAutocomplete').directive('vsGoogleAutocomplete', ['vsGoo
 			var autocompleteOptions = scope.vsGoogleAutocomplete || {},
 				autocomplete = new google.maps.places.Autocomplete(element[0], autocompleteOptions);
 
+			/*
+			 ProVision.bg - Modification for dynamic set of vsGoogleAutocomplete Options
+			 @author: Venelin Iliev <venelin@provision.bg>
+			 */
+			scope.$watch('vsGoogleAutocomplete', function () {
+				autocomplete.setComponentRestrictions(scope.vsGoogleAutocomplete.componentRestrictions || {});
+				autocomplete.setTypes(scope.vsGoogleAutocomplete.types || {});
+			});
+
 			// google place object
 			var place;
 
diff --git a/dist/vs-google-autocomplete.min.js b/dist/vs-google-autocomplete.min.js
index f5c06ed..1c29c97 100644
--- a/dist/vs-google-autocomplete.min.js
+++ b/dist/vs-google-autocomplete.min.js
@@ -1 +1 @@
-!function(a,b){"use strict";angular.module("vsGoogleAutocomplete",[]),angular.module("vsGoogleAutocomplete").factory("vsGooglePlaceUtility",function(){function a(a){return a?!!a.place_id:!1}function b(b,c){var d,e,f;if(!a(b))return!1;d=b.types;for(var g=0;g<c.length;g++){f=c[g];for(var h=0;h<d.length;h++)if(e=d[h],e===f)return!0}return!1}function c(b,c){var d;if(a(b))for(var e=0;e<b.address_components.length;e++){var f=b.address_components[e].types[0];if(c[f])return d=b.address_components[e][c[f]]}}function d(b){return a(b)?b.place_id:void 0}function e(a){var b={street_number:"short_name"},d=c(a,b);return d}function f(a){var b={route:"long_name"},d=c(a,b);return d}function g(a){var b={locality:"long_name"},d=c(a,b);return d}function h(a){var b={administrative_area_level_1:"short_name"},d=c(a,b);return d}function i(a){var b={administrative_area_level_2:"short_name"},d=c(a,b);return d}function j(a){var b={country:"short_name"},d=c(a,b);return d}function k(a){var b={country:"long_name"},d=c(a,b);return d}function l(a){var b={postal_code:"long_name"},d=c(a,b);return d}function m(a){return angular.isObject(a)&&angular.isObject(a.geometry)}function n(a){return m(a)?a.geometry.location.lat():void 0}function o(a){return m(a)?a.geometry.location.lng():void 0}return{isGooglePlace:a,isContainTypes:b,getPlaceId:d,getStreetNumber:e,getStreet:f,getCity:g,getState:h,getCountryShort:j,getCountry:k,getLatitude:n,getLongitude:o,getPostCode:l,getDistrict:i}}),angular.module("vsGoogleAutocomplete").directive("vsGoogleAutocomplete",["vsGooglePlaceUtility","$timeout",function(a,b){return{restrict:"A",require:["vsGoogleAutocomplete","ngModel"],scope:{vsGoogleAutocomplete:"=",vsPlace:"=?",vsPlaceId:"=?",vsStreetNumber:"=?",vsStreet:"=?",vsCity:"=?",vsState:"=?",vsCountryShort:"=?",vsCountry:"=?",vsPostCode:"=?",vsLatitude:"=?",vsLongitude:"=?",vsDistrict:"=?"},controller:["$scope","$attrs",function(b,c){this.isolatedScope=b,this.updatePlaceComponents=function(d){b.vsPlaceId=c.vsPlaceId&&d?a.getPlaceId(d):void 0,b.vsStreetNumber=c.vsStreetNumber&&d?a.getStreetNumber(d):void 0,b.vsStreet=c.vsStreet&&d?a.getStreet(d):void 0,b.vsCity=c.vsCity&&d?a.getCity(d):void 0,b.vsPostCode=c.vsPostCode&&d?a.getPostCode(d):void 0,b.vsState=c.vsState&&d?a.getState(d):void 0,b.vsCountryShort=c.vsCountryShort&&d?a.getCountryShort(d):void 0,b.vsCountry=c.vsCountry&&d?a.getCountry(d):void 0,b.vsLatitude=c.vsLatitude&&d?a.getLatitude(d):void 0,b.vsLongitude=c.vsLongitude&&d?a.getLongitude(d):void 0,b.vsDistrict=c.vsDistrict&&d?a.getDistrict(d):void 0}}],link:function(a,c,d,e){var f,g,h=e[0],i=e[1],j=a.vsGoogleAutocomplete||{},k=new google.maps.places.Autocomplete(c[0],j);google.maps.event.addListener(k,"place_changed",function(){f=k.getPlace(),g=f.formatted_address||i.$viewValue,a.$apply(function(){a.vsPlace=f,h.updatePlaceComponents(f),i.$setViewValue(g),i.$render()})}),c.on("blur",function(c){g=f&&f.formatted_address?g:i.$viewValue,b(function(){a.$apply(function(){i.$setViewValue(g),i.$render()})})}),google.maps.event.addDomListener(c[0],"keydown",function(a){13==a.keyCode&&a.preventDefault()})}}}])}(window,document);
\ No newline at end of file
+!function(a,b){"use strict";angular.module("vsGoogleAutocomplete",[]),angular.module("vsGoogleAutocomplete").factory("vsGooglePlaceUtility",function(){function a(a){return a?!!a.place_id:!1}function b(b,c){var d,e,f;if(!a(b))return!1;d=b.types;for(var g=0;g<c.length;g++){f=c[g];for(var h=0;h<d.length;h++)if(e=d[h],e===f)return!0}return!1}function c(b,c){var d;if(a(b))for(var e=0;e<b.address_components.length;e++){var f=b.address_components[e].types[0];if(c[f])return d=b.address_components[e][c[f]]}}function d(b){return a(b)?b.place_id:void 0}function e(a){var b={street_number:"short_name"},d=c(a,b);return d}function f(a){var b={route:"long_name"},d=c(a,b);return d}function g(a){var b={locality:"long_name"},d=c(a,b);return d}function h(a){var b={administrative_area_level_1:"short_name"},d=c(a,b);return d}function i(a){var b={administrative_area_level_2:"short_name"},d=c(a,b);return d}function j(a){var b={country:"short_name"},d=c(a,b);return d}function k(a){var b={country:"long_name"},d=c(a,b);return d}function l(a){var b={postal_code:"long_name"},d=c(a,b);return d}function m(a){return angular.isObject(a)&&angular.isObject(a.geometry)}function n(a){return m(a)?a.geometry.location.lat():void 0}function o(a){return m(a)?a.geometry.location.lng():void 0}return{isGooglePlace:a,isContainTypes:b,getPlaceId:d,getStreetNumber:e,getStreet:f,getCity:g,getState:h,getCountryShort:j,getCountry:k,getLatitude:n,getLongitude:o,getPostCode:l,getDistrict:i}}),angular.module("vsGoogleAutocomplete").directive("vsGoogleAutocomplete",["vsGooglePlaceUtility","$timeout",function(a,b){return{restrict:"A",require:["vsGoogleAutocomplete","ngModel"],scope:{vsGoogleAutocomplete:"=",vsPlace:"=?",vsPlaceId:"=?",vsStreetNumber:"=?",vsStreet:"=?",vsCity:"=?",vsState:"=?",vsCountryShort:"=?",vsCountry:"=?",vsPostCode:"=?",vsLatitude:"=?",vsLongitude:"=?",vsDistrict:"=?"},controller:["$scope","$attrs",function(b,c){this.isolatedScope=b,this.updatePlaceComponents=function(d){b.vsPlaceId=c.vsPlaceId&&d?a.getPlaceId(d):void 0,b.vsStreetNumber=c.vsStreetNumber&&d?a.getStreetNumber(d):void 0,b.vsStreet=c.vsStreet&&d?a.getStreet(d):void 0,b.vsCity=c.vsCity&&d?a.getCity(d):void 0,b.vsPostCode=c.vsPostCode&&d?a.getPostCode(d):void 0,b.vsState=c.vsState&&d?a.getState(d):void 0,b.vsCountryShort=c.vsCountryShort&&d?a.getCountryShort(d):void 0,b.vsCountry=c.vsCountry&&d?a.getCountry(d):void 0,b.vsLatitude=c.vsLatitude&&d?a.getLatitude(d):void 0,b.vsLongitude=c.vsLongitude&&d?a.getLongitude(d):void 0,b.vsDistrict=c.vsDistrict&&d?a.getDistrict(d):void 0}}],link:function(a,c,d,e){var f=e[0],g=e[1],h=a.vsGoogleAutocomplete||{},i=new google.maps.places.Autocomplete(c[0],h);a.$watch("vsGoogleAutocomplete",function(){i.setComponentRestrictions(a.vsGoogleAutocomplete.componentRestrictions||{}),i.setTypes(a.vsGoogleAutocomplete.types||{})});var j,k;google.maps.event.addListener(i,"place_changed",function(){j=i.getPlace(),k=j.formatted_address||g.$viewValue,a.$apply(function(){a.vsPlace=j,f.updatePlaceComponents(j),g.$setViewValue(k),g.$render()})}),c.on("blur",function(c){k=j&&j.formatted_address?k:g.$viewValue,b(function(){a.$apply(function(){g.$setViewValue(k),g.$render()})})}),google.maps.event.addDomListener(c[0],"keydown",function(a){13==a.keyCode&&a.preventDefault()})}}}])}(window,document);
\ No newline at end of file
diff --git a/src/vs-google-autocomplete.js b/src/vs-google-autocomplete.js
index 2032b88..aec5cd7 100644
--- a/src/vs-google-autocomplete.js
+++ b/src/vs-google-autocomplete.js
@@ -173,6 +173,15 @@ angular.module('vsGoogleAutocomplete').directive('vsGoogleAutocomplete', ['vsGoo
 			var autocompleteOptions = scope.vsGoogleAutocomplete || {},
 				autocomplete = new google.maps.places.Autocomplete(element[0], autocompleteOptions);
 
+			/*
+			 ProVision.bg - Modification for dynamic set of vsGoogleAutocomplete Options
+			 @author: Venelin Iliev <venelin@provision.bg>
+			 */
+			scope.$watch('vsGoogleAutocomplete', function () {
+				autocomplete.setComponentRestrictions(scope.vsGoogleAutocomplete.componentRestrictions || {});
+				autocomplete.setTypes(scope.vsGoogleAutocomplete.types || {});
+			});
+
 			// google place object
 			var place;