Merge remote-tracking branch 'origin/master'

2 files changed, 9 insertions, 2 deletions

diff --git a/gulpfile.js b/gulpfile.js
index a36fb97b..5cb1bf57 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -54,7 +54,7 @@ if (fs.existsSync('./compile-options.json')) {
 				}
 			})
 		}
-
+		
 		if (typeof tempOptions.excludeIcons !== "undefined") {
 			if (!Array.isArray(tempOptions.excludeIcons)) {
 				throw "property excludeIcons is not an array"
@@ -64,6 +64,13 @@ if (fs.existsSync('./compile-options.json')) {
 			})
 		}
 
+		if (typeof tempOptions.excludeOffIcons !== "undefined" && tempOptions.excludeOffIcons) {
+		    	// Exclude `*-off` icons
+			compileOptions.includeIcons = compileOptions.includeIcons.filter(function (icon) {
+				return !icon.endsWith('-off');
+			})
+		}
+
 		if (typeof tempOptions.strokeWidth !== "undefined") {
 			if (typeof tempOptions.strokeWidth !== "string" && typeof tempOptions.strokeWidth !== "number") {
 				throw "property strokeWidth is not a string or number"
diff --git a/src/tags.json b/src/tags.json
index cab4e929..3fbfc7ad 100644
--- a/src/tags.json
+++ b/src/tags.json
@@ -3,7 +3,7 @@
 { {% for icon in site.icons %}
 {% assign slug-tags = icon.slug | split: '-' %}{% assign tags = slug-tags | concat: icon.tags %}  "{{ icon.slug }}": {
     "category": "{{ icon.category }}",
-    "tags": [{% for tag in tags %}"{{ tag }}"{% unless forloop.last %}, {% endunless %}{% endfor %}],
+    "tags": ["{{ tags | join: '", "' }}"],
     "version": "{{ icon.version }}"
   }{% unless forloop.last %}, {% endunless %}{% endfor %}
 }