diff --git a/bower.json b/bower.json
index 86d5960..f601dc0 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "doc-amd",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "homepage": "https://github.com/elo7/doc-amd",
   "description": "A small DOM manipulation library",
   "main": "doc.js",
diff --git a/doc.js b/doc.js
index 281dd5f..b3043d7 100644
--- a/doc.js
+++ b/doc.js
@@ -20,10 +20,13 @@ define('doc', ['event'], function(event) {
 
 	var search = function(namespace, selector) {
 		var selector = selector.replace(/^\s+|\s+$/g, '');
-		if (matcher.isTag(selector)) {
+		if (matcher.isTag(selector) && namespace.getElementsByTagName) {
 			return convertHtmlCollectionToArray(namespace.getElementsByTagName(selector));
 		} else if(matcher.isId(selector)) {
 			selector = selector.replace('#', '');
+			if (namespace.getElementById) {
+				return namespace.getElementById(selector);
+			}
 			return document.getElementById(selector);
 		} else if (matcher.isClass(selector) && namespace.getElementsByClassName) {
 			selector = selector.replace('.', '');
diff --git a/doc.min.js b/doc.min.js
index 5af5d92..c852d5e 100644
--- a/doc.min.js
+++ b/doc.min.js
@@ -1 +1 @@
-define("doc",["event"],function(t){function e(t){return t?u("string"==typeof t?r(document,t):t):t}var n={isTag:function(t){return t.match(/^\w+$/)},isClass:function(t){return t.match(/^\.[\w-]+$/)},isId:function(t){return t.match(/^#[\w-]+$/)},isTagWithClass:function(t){return t.match(/[\w+\.\w+]+/)}},i=function(t){return!!(t&&t.call&&t.apply)},r=function(t,e){var e=e.replace(/^\s+|\s+$/g,"");return n.isTag(e)?o(t.getElementsByTagName(e)):n.isId(e)?(e=e.replace("#",""),document.getElementById(e)):n.isClass(e)&&t.getElementsByClassName?(e=e.replace(".",""),o(t.getElementsByClassName(e))):o(t.querySelectorAll(e))},o=function(t){try{return Array.prototype.slice.call(namespace.getElementsByTagName(selector))}catch(r){for(var e=[],n=t.length,i=0;i<n;i++)e.push(t[i]);return e}},s=function(t,e,n){var r;if(document.createEvent){var o=document.createEvent("Event");o.initEvent(e,!1,!0),o.detail=n,r=t.dispatchEvent(o)}else if(n){(o=document.createEventObject()).detail=n;var s=t._event[e];for(var c in s)for(var u=0;u<s[c].length;u++)s[c][u](o)}else r=t.fireEvent("on"+e);r&&i(t[e])&&t[e]()},c=function(t){for(var e=t.length,n=[],i=0;i<e;i++){var r=t[i];r.nodeType===Node.ELEMENT_NODE&&n.push(r)}return n},u=function(e){var n=[];return e&&(e instanceof Array?n=e:e instanceof HTMLCollection?n=o(e):e instanceof NodeList?n=c(e):n.push(e)),{els:n,size:n.length,each:function(t){for(var e=0;e<this.size;e++)t(this.els[e],e)},data:function(t,e){return void 0!==e?(this.each(function(n){n.setAttribute("data-"+t,e)}),this):this.first()?this.first().getAttribute("data-"+t):""},val:function(t){return void 0!==t?(this.each(function(e){e.value=t}),this):this.first()?this.first().value:""},html:function(t){return void 0!==t?(this.each(function(e){e.innerHTML=t}),this):this.first()?this.first().innerHTML:""},prepend:function(t){return this.each(function(e){if("object"==typeof t){if(t.els)return void t.each(function(t){e.insertAdjacentElement("afterbegin",t)});e.insertAdjacentElement("afterbegin",t)}else e.insertAdjacentHTML("afterbegin",t)}),this},append:function(t){var e;return this.each(function(n){e=n.appendChild(t)}),u(e)},text:function(t){var e=void 0!=document.getElementsByTagName("body")[0].innerText,n="";return this.each(function(i){void 0===t?n=i.textContent||i.innerText:e?i.innerText=t:i.textContent=t}),n.trim()},attr:function(t,e){if(void 0!==e)return"string"==typeof t&&this.each(function(n){n.setAttribute(t,e)}),this;if("object"==typeof t){for(k in t)this.each(function(e){e.setAttribute(k,t[k])});return this}return this.first().getAttribute(t)},removeAttr:function(t){var e=t.split(" ");return this.each(function(t){e.forEach(function(e){t.removeAttribute(e)})}),this},hasClass:function(t){var e=!1;return this.each(function(n){n.classList.contains(t)&&(e=!0)}),e},addClass:function(t){var e=t.split(" ");return this.each(function(t){e.forEach(function(e){t.classList.add(e)})}),this},removeClass:function(t){var e=t.split(" ");return this.each(function(t){e.forEach(function(e){t.classList.remove(e)})}),this},toggleClass:function(t){var e=t.split(" ");return this.each(function(t){e.forEach(function(e){t.classList.toggle(e)})}),this},removeItem:function(){return this.each(function(t,e){t.remove?t.remove():t.parentNode.removeChild(t),t=null}),this.els=[],this.size=0,this},find:function(t){var e=[];return this.each(function(n){var i=r(n,t);-1===e.indexOf(i)&&(e=e.concat(r(n,t)))}),u(e)},filter:function(t){for(var e=[],n=0;n<this.size;n++)"function"==typeof t&&t(this.els[n])?e.push(this.els[n]):"string"==typeof t&&this.els[n][t]&&e.push(this.els[n]);return u(e)},closest:function(t){function e(n){return!n||n instanceof Element&&i.call(n,t)?n:e(n.parentNode)}var n=[],i=HTMLElement.prototype.matches||HTMLElement.prototype.webkitMatchesSelector||HTMLElement.prototype.mozMatchesSelector||HTMLElement.prototype.msMatchesSelector||HTMLElement.prototype.oMatchesSelector;return this.each(function(t){var i=e(t.parentNode);i&&-1===n.indexOf(i)&&n.push(i)}),u(n)},first:function(){return this.els[0]},last:function(){return this.els[this.size-1]},previous:function(){var t=this.els[0];if(t.previousElementSibling)return u(t.previousElementSibling);for(;t=t.previousSibling;)if(1===t.nodeType)return u(t)},next:function(){var t=this.els[0];if(t.nextElementSibling)return u(t.nextElementSibling);for(;t=t.nextSibling;)if(1===t.nodeType)return u(t)},parent:function(){for(var t=[],e=0;e<this.size;e++)t.push(this.els[e].parentElement);return u(t)},isPresent:function(){return void 0!==this.els&&this.els.length>0},isEmpty:function(){return!this.isPresent()},on:function(e,n,i){return this.each(function(r){t.addEvent(r,e,n,i)}),t.boundEvents=t.boundEvents||{},t.boundEvents[e]=t.boundEvents[e]||[],boundElements=t.boundEvents[e],this.each(function(t){-1===boundElements.indexOf(t)&&boundElements.push(t)}),this},throttle:function(t,e,n,i){n=n||1e3;var r=0;return this.on(t,function(t){var i=+new Date;r+n<=i&&(e.apply(this,arguments),r=+new Date),t.preventDefault()},i)},debounce:function(t,e,n,i){n=n||1e3;var r=0;return this.on(t,function(t){clearTimeout(r),r=setTimeout(e.bind(this),n),t.preventDefault()},i)},off:function(e,n){return this.each(function(i){t.removeEvent(i,e,n)}),t.boundEvents=t.boundEvents||{},t.boundEvents[e]=t.boundEvents[e]||[],boundElements=t.boundEvents[e],elementIndex=-1,this.each(function(t){-1!==(elementIndex=boundElements.indexOf(t))&&boundElements.splice(elementIndex,1)}),this},trigger:function(t,e){this.each(function(n){s(n,t,e)})},selectedText:function(){var t=this.els[0],e=this.attr("type"),n=!!e&&e.match("(text|search|password|tel|url)");return document.activeElement!==t?void 0:n&&void 0!==t.selectionStart&&t.selectionEnd>0?t.value.substring(t.selectionStart,t.selectionEnd):window.getSelection?window.getSelection().toString():document.getSelection?document.getSelection().toString():document.selection?document.selection.createRange().text?document.selection.createRange().text:document.selection.createRange().htmlText:void 0},focus:function(){return this.els[0].focus(),this},scrollIntoView:function(t){var t="boolean"==typeof t?t:t||!0;return this.els[0].scrollIntoView(t),this},insertBefore:function(t){"string"==typeof t&&(t=u(r(document,t))),t.each(function(t){if(!t.parentNode)throw Error("Trying to insert element before element without parent");t.insertAdjacentHTML("beforebegin",this.els[0].outerHTML)}.bind(this))},insertAfter:function(t){"string"==typeof t&&(t=u(r(document,t))),t.each(function(t){if(!t.parentNode)throw Error("Trying to insert element after element without parent");t.insertAdjacentHTML("afterend",this.els[0].outerHTML)}.bind(this))}}};return e.broadcast=function(e,n){for(var i=t.boundEvents[e]||[],r=0;r<i.length;r++)s(i[r],e,n)},e});
\ No newline at end of file
+define("doc",["event"],function(t){function e(t){return t?u("string"==typeof t?r(document,t):t):t}var n={isTag:function(t){return t.match(/^\w+$/)},isClass:function(t){return t.match(/^\.[\w-]+$/)},isId:function(t){return t.match(/^#[\w-]+$/)},isTagWithClass:function(t){return t.match(/[\w+\.\w+]+/)}},i=function(t){return!!(t&&t.call&&t.apply)},r=function(t,e){var e=e.replace(/^\s+|\s+$/g,"");return n.isTag(e)&&t.getElementsByTagName?o(t.getElementsByTagName(e)):n.isId(e)?(e=e.replace("#",""),t.getElementById?t.getElementById(e):document.getElementById(e)):n.isClass(e)&&t.getElementsByClassName?(e=e.replace(".",""),o(t.getElementsByClassName(e))):o(t.querySelectorAll(e))},o=function(t){try{return Array.prototype.slice.call(namespace.getElementsByTagName(selector))}catch(r){for(var e=[],n=t.length,i=0;i<n;i++)e.push(t[i]);return e}},s=function(t,e,n){var r;if(document.createEvent){var o=document.createEvent("Event");o.initEvent(e,!1,!0),o.detail=n,r=t.dispatchEvent(o)}else if(n){(o=document.createEventObject()).detail=n;var s=t._event[e];for(var c in s)for(var u=0;u<s[c].length;u++)s[c][u](o)}else r=t.fireEvent("on"+e);r&&i(t[e])&&t[e]()},c=function(t){for(var e=t.length,n=[],i=0;i<e;i++){var r=t[i];r.nodeType===Node.ELEMENT_NODE&&n.push(r)}return n},u=function(e){var n=[];return e&&(e instanceof Array?n=e:e instanceof HTMLCollection?n=o(e):e instanceof NodeList?n=c(e):n.push(e)),{els:n,size:n.length,each:function(t){for(var e=0;e<this.size;e++)t(this.els[e],e)},data:function(t,e){return void 0!==e?(this.each(function(n){n.setAttribute("data-"+t,e)}),this):this.first()?this.first().getAttribute("data-"+t):""},val:function(t){return void 0!==t?(this.each(function(e){e.value=t}),this):this.first()?this.first().value:""},html:function(t){return void 0!==t?(this.each(function(e){e.innerHTML=t}),this):this.first()?this.first().innerHTML:""},prepend:function(t){return this.each(function(e){if("object"==typeof t){if(t.els)return void t.each(function(t){e.insertAdjacentElement("afterbegin",t)});e.insertAdjacentElement("afterbegin",t)}else e.insertAdjacentHTML("afterbegin",t)}),this},append:function(t){var e;return this.each(function(n){e=n.appendChild(t)}),u(e)},text:function(t){var e=void 0!=document.getElementsByTagName("body")[0].innerText,n="";return this.each(function(i){void 0===t?n=i.textContent||i.innerText:e?i.innerText=t:i.textContent=t}),n.trim()},attr:function(t,e){if(void 0!==e)return"string"==typeof t&&this.each(function(n){n.setAttribute(t,e)}),this;if("object"==typeof t){for(k in t)this.each(function(e){e.setAttribute(k,t[k])});return this}return this.first().getAttribute(t)},removeAttr:function(t){var e=t.split(" ");return this.each(function(t){e.forEach(function(e){t.removeAttribute(e)})}),this},hasClass:function(t){var e=!1;return this.each(function(n){n.classList.contains(t)&&(e=!0)}),e},addClass:function(t){var e=t.split(" ");return this.each(function(t){e.forEach(function(e){t.classList.add(e)})}),this},removeClass:function(t){var e=t.split(" ");return this.each(function(t){e.forEach(function(e){t.classList.remove(e)})}),this},toggleClass:function(t){var e=t.split(" ");return this.each(function(t){e.forEach(function(e){t.classList.toggle(e)})}),this},removeItem:function(){return this.each(function(t,e){t.remove?t.remove():t.parentNode.removeChild(t),t=null}),this.els=[],this.size=0,this},find:function(t){var e=[];return this.each(function(n){var i=r(n,t);-1===e.indexOf(i)&&(e=e.concat(r(n,t)))}),u(e)},filter:function(t){for(var e=[],n=0;n<this.size;n++)"function"==typeof t&&t(this.els[n])?e.push(this.els[n]):"string"==typeof t&&this.els[n][t]&&e.push(this.els[n]);return u(e)},closest:function(t){function e(n){return!n||n instanceof Element&&i.call(n,t)?n:e(n.parentNode)}var n=[],i=HTMLElement.prototype.matches||HTMLElement.prototype.webkitMatchesSelector||HTMLElement.prototype.mozMatchesSelector||HTMLElement.prototype.msMatchesSelector||HTMLElement.prototype.oMatchesSelector;return this.each(function(t){var i=e(t.parentNode);i&&-1===n.indexOf(i)&&n.push(i)}),u(n)},first:function(){return this.els[0]},last:function(){return this.els[this.size-1]},previous:function(){var t=this.els[0];if(t.previousElementSibling)return u(t.previousElementSibling);for(;t=t.previousSibling;)if(1===t.nodeType)return u(t)},next:function(){var t=this.els[0];if(t.nextElementSibling)return u(t.nextElementSibling);for(;t=t.nextSibling;)if(1===t.nodeType)return u(t)},parent:function(){for(var t=[],e=0;e<this.size;e++)t.push(this.els[e].parentElement);return u(t)},isPresent:function(){return void 0!==this.els&&this.els.length>0},isEmpty:function(){return!this.isPresent()},on:function(e,n,i){return this.each(function(r){t.addEvent(r,e,n,i)}),t.boundEvents=t.boundEvents||{},t.boundEvents[e]=t.boundEvents[e]||[],boundElements=t.boundEvents[e],this.each(function(t){-1===boundElements.indexOf(t)&&boundElements.push(t)}),this},throttle:function(t,e,n,i){n=n||1e3;var r=0;return this.on(t,function(t){var i=+new Date;r+n<=i&&(e.apply(this,arguments),r=+new Date),t.preventDefault()},i)},debounce:function(t,e,n,i){n=n||1e3;var r=0;return this.on(t,function(t){clearTimeout(r),r=setTimeout(e.bind(this),n),t.preventDefault()},i)},off:function(e,n){return this.each(function(i){t.removeEvent(i,e,n)}),t.boundEvents=t.boundEvents||{},t.boundEvents[e]=t.boundEvents[e]||[],boundElements=t.boundEvents[e],elementIndex=-1,this.each(function(t){-1!==(elementIndex=boundElements.indexOf(t))&&boundElements.splice(elementIndex,1)}),this},trigger:function(t,e){this.each(function(n){s(n,t,e)})},selectedText:function(){var t=this.els[0],e=this.attr("type"),n=!!e&&e.match("(text|search|password|tel|url)");return document.activeElement!==t?void 0:n&&void 0!==t.selectionStart&&t.selectionEnd>0?t.value.substring(t.selectionStart,t.selectionEnd):window.getSelection?window.getSelection().toString():document.getSelection?document.getSelection().toString():document.selection?document.selection.createRange().text?document.selection.createRange().text:document.selection.createRange().htmlText:void 0},focus:function(){return this.els[0].focus(),this},scrollIntoView:function(t){var t="boolean"==typeof t?t:t||!0;return this.els[0].scrollIntoView(t),this},insertBefore:function(t){"string"==typeof t&&(t=u(r(document,t))),t.each(function(t){if(!t.parentNode)throw Error("Trying to insert element before element without parent");t.insertAdjacentHTML("beforebegin",this.els[0].outerHTML)}.bind(this))},insertAfter:function(t){"string"==typeof t&&(t=u(r(document,t))),t.each(function(t){if(!t.parentNode)throw Error("Trying to insert element after element without parent");t.insertAdjacentHTML("afterend",this.els[0].outerHTML)}.bind(this))}}};return e.broadcast=function(e,n){for(var i=t.boundEvents[e]||[],r=0;r<i.length;r++)s(i[r],e,n)},e});
\ No newline at end of file
diff --git a/package.json b/package.json
index b15d06d..811e9ee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elo7-doc-amd",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "license": "BSD-3-Clause",
   "description": "Elo7 doc amd",
   "keywords": [
@@ -19,16 +19,16 @@
   },
   "author": "Elo7",
   "dependencies": {
-    "define-async": "1.1.1",
+    "define-async": "1.2.0",
     "elo7-events-amd": "1.1.3"
   },
   "devDependencies": {
-    "bower": "1.4.1",
-    "http-server": "0.7.4",
-    "mocha": "2.0.1",
+    "bower": "1.8.2",
+    "http-server": "0.10.0",
+    "mocha": "4.0.1",
     "mocha-phantomjs": "4.1.0",
-    "phantomjs-prebuilt": "2.1.14",
-    "proclaim": "2.0.0",
-    "uglify-js": "3.0.28"
+    "phantomjs-prebuilt": "2.1.15",
+    "proclaim": "3.4.6",
+    "uglify-js": "3.1.3"
   }
 }
diff --git a/test/docTest.js.html b/test/docTest.js.html
index 95c8b1e..35d11c9 100644
--- a/test/docTest.js.html
+++ b/test/docTest.js.html
@@ -77,6 +77,7 @@
       <div id='first-broadcast-listener'></div>
       <div id='second-broadcast-listener'></div>
       <div id='third-broadcast-listener'></div>
+      <div id='shadow-root-test'></div>
     </div>
 
     <div id="mocha"></div>
@@ -632,6 +633,33 @@
             }, 10);
             fireEvent($('#debounce-button').first(), 'click');
           });
+          describe('with shadow DOM', function() {
+            before(function() {
+              if (!HTMLElement.prototype.createShadowRoot) {
+                this.skip();
+              }
+            });
+            it("should find elements inside shadow root by tag name", function() {
+              var $root = $($('#shadow-root-test').first().createShadowRoot()),
+                div = document.createElement('div');
+              $root.append(div);
+              assert.equal($root.find('div').first(), div);
+            });
+            it("should find elements inside shadow root by id", function() {
+              var $root = $($('#shadow-root-test').first().createShadowRoot()),
+                div = document.createElement('div');
+              div.id = 'mocha';
+              $root.append(div);
+              assert.equal($root.find('#mocha').first(), div);
+            });
+            it("should find elements inside shadow root by class name", function() {
+              var $root = $($('#shadow-root-test').first().createShadowRoot()),
+                div = document.createElement('div');
+              div.className = 'search-class-test';
+              $root.append(div);
+              assert.equal($root.find('.search-class-test').first(), div);
+            });
+          });
         });
       });
     </script>