diff --git a/README.markdown b/README.markdown
index b87719e..eaced72 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,4 +1,5 @@
 # JSS
+v0.7.1
 
 A simple JavaScript library for retrieving and setting CSS stylesheet rules.
 
@@ -50,17 +51,19 @@ If your project uses Bower for package management you can run the following comm
     }
     
 
-**jss.getAll(selector)** to retrieve all rules that are specified using the selector (not necessarily added via JSS):
+**jss.getAll(selector[,sheetname])** to retrieve all rules that are specified using the selector (not necessarily added via JSS):
 
-    jss.getAll('.demo');
+    jss.getAll('.demo'); // search through whole CSS stack
     // returns the following:
     {
         'font-size': '15px',
         'color': 'red',
         'font-weight': 'bold'
     }
+    
+    jss.getAll('.demo','this_file_only.css'); // search only the given CSS file (which must be included in the page)
 
 **jss.remove([selector])** to remove rules added via JSS:
 
     jss.remove('.demo'); // removes all JSS styles matching the selector
-    jss.remove();        // removes all JSS styles
\ No newline at end of file
+    jss.remove();        // removes all JSS styles
diff --git a/bower.json b/bower.json
index 7c6d3ac..9da4153 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "jss",
-    "version": "0.6",
+    "version": "0.7.1",
     "main": "jss.js",
     "ignore": [ "test", "test/*" ]
 }
diff --git a/jss.js b/jss.js
index ca4cde0..09dc766 100644
--- a/jss.js
+++ b/jss.js
@@ -1,5 +1,5 @@
 /*
- * JSS v0.6 - JavaScript Stylesheets
+ * JSS v0.7.1 - JavaScript Stylesheets
  * https://github.com/Box9/jss
  *
  * Copyright (c) 2011, David Tang
@@ -177,14 +177,16 @@ var jss = (function() {
     function setStyleProperties(rule, properties) {
         for (var key in properties) {
             var value = properties[key];
-            var importantIndex = value.indexOf(' !important');
-
-            // Modern browsers seem to handle overrides fine, but IE9 doesn't
-            rule.style.removeProperty(key); 
-            if (importantIndex > 0) {
-                rule.style.setProperty(key, value.substr(0, importantIndex), 'important');
-            } else {
-                rule.style.setProperty(key, value);
+            if ( typeof value !== "undefined" ) {
+                var importantIndex = value.indexOf(' !important');
+                
+                // Modern browsers seem to handle overrides fine, but IE9 doesn't
+                rule.style.removeProperty(key); 
+                if (importantIndex > 0) {
+                    rule.style.setProperty(key, value.substr(0, importantIndex), 'important');
+                } else {
+                    rule.style.setProperty(key, value);
+                }
             }
         }
     }
@@ -231,10 +233,20 @@ var jss = (function() {
             return rules;
         },
         // Returns all rules (selector is required)
-        getAll: function(selector) {
+        getAll: function(selector,sheet_name) {
             var properties = {};
+            var regex_search;
+            if ( ( typeof sheet_name !== "undefined" ) && ( sheet_name != null ) ) {
+              regex_search = new RegExp( sheet_name, "g" );
+            }
             for (var i = 0; i < this.sheets.length; i++) {
+              if ( regex_search ) {
+                if ( regex_search.test( this.sheets[i].href ) ) {
+                  extend(properties, aggregateStyles(getRules(this.sheets[i], selector)));
+                }
+              } else {
                 extend(properties, aggregateStyles(getRules(this.sheets[i], selector)));
+              }
             }
             return properties;
         },
@@ -287,4 +299,4 @@ var jss = (function() {
     return exports;
 })();
 
-typeof module !== 'undefined' && module.exports && (module.exports = jss); // CommonJS support
\ No newline at end of file
+typeof module !== 'undefined' && module.exports && (module.exports = jss); // CommonJS support
diff --git a/jss.min.js b/jss.min.js
index 29bed50..72d2534 100644
--- a/jss.min.js
+++ b/jss.min.js
@@ -1 +1 @@
-var jss=function(){function e(e){for(var t=e.cssRules||e.rules||[],r={},n=0;n<t.length;n++){var s=u(t[n].selectorText);r[s]||(r[s]=[]),r[s].push({sheet:e,index:n,style:t[n].style})}return r}function t(e,t){var r=e.cssRules||e.rules||[],n=[];t=t.toLowerCase();for(var s=0;s<r.length;s++){var u=r[s].selectorText;!u||u!=t&&u!=f(t)&&u!=c(t)||n.push({sheet:e,index:s,style:r[s].style})}return n}function r(e,t){var r=e.cssRules||e.rules||[],u=r.length,i=s(e,t,r,u);return i||n(e,t,u),{sheet:e,index:u,style:r[u].style}}function n(e,t,r){e.insertRule?e.insertRule(t+" { }",r):e.addRule(t,null,r)}function s(e,t,r,s){var o,h;if(x.exec(t))o=t,h=i(t);else{if(!S.exec(t))return!1;o=u(t),h=t}return p||(n(e,o,s),r.length<=s&&(p=!0)),p&&n(e,h,s),!0}function u(e){return e.replace(S,function(e,t,r,n){return t+"::"+n})}function i(e){return e.replace(x,function(e,t,r){return":"+r})}function o(e){var t=e.sheet;t.deleteRule?t.deleteRule(e.index):t.removeRule&&t.removeRule(e.index)}function h(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r]);return e}function l(e){for(var t={},r=0;r<e.length;r++)h(t,a(e[r].style));return t}function a(e){for(var t={},r=0;r<e.length;r++)t[e[r]]=e[v(e[r])];return t}function f(e){for(var t="",r=0;null!=(match=y.exec(e))&&""!==match[0];)t+=e.substring(r,match.index),t+=e.substr(match.index+match[1].length,match[2].length),t+=e.substr(match.index,match[1].length),r=match.index+match[0].length;return t+=e.substr(r)}function c(e){return x.exec(e)?i(e):e}function d(e,t){for(var r in t){var n=t[r],s=n.indexOf(" !important");e.style.removeProperty(r),s>0?e.style.setProperty(r,n.substr(0,s),"important"):e.style.setProperty(r,n)}}function v(e){return e.replace(/-([a-z])/g,function(e,t){return t.toUpperCase()})}function m(e){var t={};for(var r in e)t[g(r)]=e[r];return t}function g(e){return e.replace(/([A-Z])/g,function(e,t){return"-"+t.toLowerCase()})}var p,y=/((?:\.|#)[^\.\s#]+)((?:\.|#)[^\.\s#]+)/g,x=/(::)(before|after|first-line|first-letter|selection)/,S=/([^:])(:)(before|after|first-line|first-letter|selection)/,R=function(e){this.doc=e,this.head=this.doc.head||this.doc.getElementsByTagName("head")[0],this.sheets=this.doc.styleSheets||[]};R.prototype={get:function(r){if(!this.defaultSheet)return{};if(r)return l(t(this.defaultSheet,r));var n=e(this.defaultSheet);for(r in n)n[r]=l(n[r]);return n},getAll:function(e){for(var r={},n=0;n<this.sheets.length;n++)h(r,l(t(this.sheets[n],e)));return r},set:function(e,n){this.defaultSheet||(this.defaultSheet=this._createSheet()),n=m(n);var s=t(this.defaultSheet,e);s.length||(s=[r(this.defaultSheet,e)]);for(var u=0;u<s.length;u++)d(s[u],n)},remove:function(e){if(this.defaultSheet){if(!e)return this._removeSheet(this.defaultSheet),void delete this.defaultSheet;for(var r=t(this.defaultSheet,e),n=0;n<r.length;n++)o(r[n]);return r.length}},_createSheet:function(){var e=this.doc.createElement("style");return e.type="text/css",e.rel="stylesheet",this.head.appendChild(e),e.sheet},_removeSheet:function(e){var t=e.ownerNode;t.parentNode.removeChild(t)}};var b=new R(document);return b.forDocument=function(e){return new R(e)},b}();"undefined"!=typeof module&&module.exports&&(module.exports=jss);
\ No newline at end of file
+var jss=(function(){var adjSelAttrRegex=/((?:\.|#)[^\.\s#]+)((?:\.|#)[^\.\s#]+)/g;var doubleColonPseudoElRegex=/(::)(before|after|first-line|first-letter|selection)/;var singleColonPseudoElRegex=/([^:])(:)(before|after|first-line|first-letter|selection)/;var singleColonForPseudoElements;function getSelectorsAndRules(sheet){var rules=sheet.cssRules||sheet.rules||[];var results={};for(var i=0;i<rules.length;i++){var selectorText=toDoubleColonPseudoElements(rules[i].selectorText);if(!results[selectorText]){results[selectorText]=[]}results[selectorText].push({sheet:sheet,index:i,style:rules[i].style})}return results}function getRules(sheet,selector){var rules=sheet.cssRules||sheet.rules||[];var results=[];selector=selector.toLowerCase();for(var i=0;i<rules.length;i++){var selectorText=rules[i].selectorText;if(selectorText&&(selectorText==selector||selectorText==swapAdjSelAttr(selector)||selectorText==swapPseudoElSyntax(selector))){results.push({sheet:sheet,index:i,style:rules[i].style})}}return results}function addRule(sheet,selector){var rules=sheet.cssRules||sheet.rules||[];var index=rules.length;var pseudoElementRule=addPseudoElementRule(sheet,selector,rules,index);if(!pseudoElementRule){addRuleToSheet(sheet,selector,index)}return{sheet:sheet,index:index,style:rules[index].style}};function addRuleToSheet(sheet,selector,index){if(sheet.insertRule){sheet.insertRule(selector+' { }',index)}else{sheet.addRule(selector,null,index)}}function addPseudoElementRule(sheet,selector,rules,index){var doubleColonSelector;var singleColonSelector;if(doubleColonPseudoElRegex.exec(selector)){doubleColonSelector=selector;singleColonSelector=toSingleColonPseudoElements(selector)}else if(singleColonPseudoElRegex.exec(selector)){doubleColonSelector=toDoubleColonPseudoElements(selector);singleColonSelector=selector}else{return false}if(!singleColonForPseudoElements){addRuleToSheet(sheet,doubleColonSelector,index);if(rules.length<=index){singleColonForPseudoElements=true}}if(singleColonForPseudoElements){addRuleToSheet(sheet,singleColonSelector,index)}return true}function toDoubleColonPseudoElements(selector){return selector.replace(singleColonPseudoElRegex,function(match,submatch1,submatch2,submatch3){return submatch1+'::'+submatch3})}function toSingleColonPseudoElements(selector){return selector.replace(doubleColonPseudoElRegex,function(match,submatch1,submatch2){return':'+submatch2})}function removeRule(rule){var sheet=rule.sheet;if(sheet.deleteRule){sheet.deleteRule(rule.index)}else if(sheet.removeRule){sheet.removeRule(rule.index)}}function extend(dest,src){for(var key in src){if(!src.hasOwnProperty(key))continue;dest[key]=src[key]}return dest}function aggregateStyles(rules){var aggregate={};for(var i=0;i<rules.length;i++){extend(aggregate,declaredProperties(rules[i].style))}return aggregate}function declaredProperties(style){var declared={};for(var i=0;i<style.length;i++){declared[style[i]]=style[toCamelCase(style[i])]}return declared}function swapAdjSelAttr(selector){var swap='';var lastIndex=0;while((match=adjSelAttrRegex.exec(selector))!=null){if(match[0]==='')break;swap+=selector.substring(lastIndex,match.index);swap+=selector.substr(match.index+match[1].length,match[2].length);swap+=selector.substr(match.index,match[1].length);lastIndex=match.index+match[0].length}swap+=selector.substr(lastIndex);return swap};function swapPseudoElSyntax(selector){if(doubleColonPseudoElRegex.exec(selector)){return toSingleColonPseudoElements(selector)}return selector}function setStyleProperties(rule,properties){for(var key in properties){var value=properties[key];if(typeof value!=="undefined"){var importantIndex=value.indexOf(' !important');rule.style.removeProperty(key);if(importantIndex>0){rule.style.setProperty(key,value.substr(0,importantIndex),'important')}else{rule.style.setProperty(key,value)}}}}function toCamelCase(str){return str.replace(/-([a-z])/g,function(match,submatch){return submatch.toUpperCase()})}function transformCamelCasedPropertyNames(oldProps){var newProps={};for(var key in oldProps){newProps[unCamelCase(key)]=oldProps[key]}return newProps}function unCamelCase(str){return str.replace(/([A-Z])/g,function(match,submatch){return'-'+submatch.toLowerCase()})}var Jss=function(doc){this.doc=doc;this.head=this.doc.head||this.doc.getElementsByTagName('head')[0];this.sheets=this.doc.styleSheets||[]};Jss.prototype={get:function(selector){if(!this.defaultSheet){return{}}if(selector){return aggregateStyles(getRules(this.defaultSheet,selector))}var rules=getSelectorsAndRules(this.defaultSheet);for(selector in rules){rules[selector]=aggregateStyles(rules[selector])}return rules},getAll:function(selector,sheet_name){var properties={};var regex_search;if((typeof sheet_name!=="undefined")&&(sheet_name!=null)){regex_search=new RegExp(sheet_name,"g")}for(var i=0;i<this.sheets.length;i++){if(regex_search){if(regex_search.test(this.sheets[i].href)){extend(properties,aggregateStyles(getRules(this.sheets[i],selector)))}}else{extend(properties,aggregateStyles(getRules(this.sheets[i],selector)))}}return properties},set:function(selector,properties){if(!this.defaultSheet){this.defaultSheet=this._createSheet()}properties=transformCamelCasedPropertyNames(properties);var rules=getRules(this.defaultSheet,selector);if(!rules.length){rules=[addRule(this.defaultSheet,selector)]}for(var i=0;i<rules.length;i++){setStyleProperties(rules[i],properties)}},remove:function(selector){if(!this.defaultSheet)return;if(!selector){this._removeSheet(this.defaultSheet);delete this.defaultSheet;return}var rules=getRules(this.defaultSheet,selector);for(var i=0;i<rules.length;i++){removeRule(rules[i])}return rules.length},_createSheet:function(){var styleNode=this.doc.createElement('style');styleNode.type='text/css';styleNode.rel='stylesheet';this.head.appendChild(styleNode);return styleNode.sheet},_removeSheet:function(sheet){var node=sheet.ownerNode;node.parentNode.removeChild(node)}};var exports=new Jss(document);exports.forDocument=function(doc){return new Jss(doc)};return exports})();typeof module!=='undefined'&&module.exports&&(module.exports=jss);
diff --git a/package.json b/package.json
index f808786..a55462b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jss",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "devDependencies": {
     "gulp": "~3.5.6",
     "gulp-uglify": "~0.2.1",