diff --git a/conditioner-core.esm.js b/conditioner-core.esm.js
index 86bbd23..b330f04 100644
--- a/conditioner-core.esm.js
+++ b/conditioner-core.esm.js
@@ -1,4 +1,4 @@
-/* conditioner-core 2.3.2 */
+/* conditioner-core 2.3.3 */
 // links the module to the element and exposes a callback api object
 const bindModule = (element, unbind) => {
 	// gets the name of the module from the element, we assume the name is an alias
@@ -289,7 +289,7 @@ const createModule = element => {
 	const query = runPlugin('moduleGetContext', element);
 
 	// wait for the right context or load the module immidiately if no context supplied
-	const monitor = createContextualModule(query, boundModule);
+	const monitor = query && createContextualModule(query, boundModule);
 
 	// return module
 	return query ? boundModule : boundModule.mount();
diff --git a/conditioner-core.js b/conditioner-core.js
index 45cdd80..9c49604 100644
--- a/conditioner-core.js
+++ b/conditioner-core.js
@@ -1,4 +1,4 @@
-/* conditioner-core 2.3.2 */
+/* conditioner-core 2.3.3 */
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
 		define(['exports'], factory);
@@ -368,7 +368,7 @@
 		var query = runPlugin('moduleGetContext', element);
 
 		// wait for the right context or load the module immidiately if no context supplied
-		var monitor = createContextualModule(query, boundModule);
+		var monitor = query && createContextualModule(query, boundModule);
 
 		// return module
 		return query ? boundModule : boundModule.mount();
diff --git a/conditioner-core.min.js b/conditioner-core.min.js
index fbedb49..aa096a9 100644
--- a/conditioner-core.min.js
+++ b/conditioner-core.min.js
@@ -1,2 +1,2 @@
-/* conditioner-core 2.3.2 */
-!function(n,t){if("function"==typeof define&&define.amd)define(["exports"],t);else if("undefined"!=typeof exports)t(exports);else{var e={};t(e),n.conditioner=e}}(this,function(n){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var u=function(n,t){if(Array.isArray(n))return n;if(Symbol.iterator in Object(n))return function(n,t){var e=[],r=!0,o=!1,u=void 0;try{for(var i,c=n[Symbol.iterator]();!(r=(i=c.next()).done)&&(e.push(i.value),!t||e.length!==t);r=!0);}catch(n){o=!0,u=n}finally{try{!r&&c.return&&c.return()}finally{if(o)throw u}}return e}(n,t);throw new TypeError("Invalid attempt to destructure non-iterable instance")};function i(n){if(Array.isArray(n)){for(var t=0,e=Array(n.length);t<n.length;t++)e[t]=n[t];return e}return Array.from(n)}function c(n){var t=n.match(a),e=u(t,5),r=e[1],o=e[2];return[e[3],function(n){return void 0===n||"true"===n||"false"!==n&&n}(e[4]),"not"===o,"was"===r]}function t(n){var t=function(t,n){var e=s("moduleGetName",t),r=l("moduleSetName",e),o={destruct:null,mounting:!1},u={alias:e,name:r,element:t,mounted:!1,unmount:function(){o.destruct&&u.mounted&&(d("moduleWillUnmount",u),o.destruct(),u.mounted=!1,d("moduleDidUnmount",u),u.onunmount.apply(t))},mount:function(){if(!u.mounted&&!o.mounting)return o.mounting=!0,d("moduleWillMount",u),s("moduleImport",r).then(function(n){o.destruct=s("moduleGetDestructor",s("moduleGetConstructor",n).apply(void 0,i(s("moduleSetConstructorArguments",r,t)))),o.mounting=!1,u.mounted=!0,d("moduleDidMount",u),u.onmount.apply(t,[u])}).catch(function(n){throw o.mounting=!1,d("moduleDidCatch",n,u),u.onmounterror.apply(t,[n,u]),new Error("Conditioner: "+n)}),u},destroy:function(){d("moduleWillDestroy",u),u.unmount(),d("moduleDidDestroy",u),u.ondestroy.apply(t),n()},onmounterror:function(){},onmount:function(){},onunmount:function(){},ondestroy:function(){}};return u}(n,function(){return r&&r.destroy()}),e=s("moduleGetContext",n),r=function(n,t){var e=o(n,t.element);return e.onchange=function(n){return n?t.mount():t.unmount()},e.start(),e}(e,t);return e?t:t.mount()}var a=/(was)? ?(not)? ?@([a-z]+) ?(.*)?/,f=/(?:was )?(?:not )?@[a-z]+ ?.*?(?:(?= and (?:was )?(?:not )?@[a-z])|$)/g,o=n.monitor=function(n,t){var e={matches:!1,active:!1,onchange:function(){},start:function(){e.active||(e.active=!0,r.forEach(function(n){return n.forEach(function(n){return n.addListener(o)})}),o())},stop:function(){e.active=!1,r.forEach(function(n){return n.forEach(function(n){n.removeListener&&n.removeListener(o)})})},destroy:function(){e.stop(),r.length=0}},r=n.split(" or ").map(function(n){return function(n){return n.match(f).map(c)}(n).map(function(n){return function(n,t,e){return n.invert=t,n.retain=e,n.matched=!1,n}.apply(void 0,[function(n,t,e){return m("monitor").find(function(n){return n.name===t}).create(e,n)}.apply(void 0,[t].concat(i(n)))].concat(i(n.splice(2))))})}),o=function(){var n=r.reduce(function(n,t){return!!n||function(n){return n.reduce(function(n,t){if(!n)return!1;var e=t.invert?!t.matches:t.matches;return e&&(t.matched=!0),!(!t.retain||!t.matched)||e},!0)}(t)},!1);e.matches=n,e.onchange(n)};return e},e=(n.hydrate=function(n){return[].concat(i(s("moduleSelector",n))).map(t)},[]),r=n.addPlugin=function(n){return e.push(n)},m=function(t){return e.filter(function(n){return function(n,t){return-1<n.indexOf(t)}(Object.keys(n),t)}).map(function(n){return n[t]})},d=function(n){for(var t=arguments.length,e=Array(1<t?t-1:0),r=1;r<t;r++)e[r-1]=arguments[r];return m(n).forEach(function(n){return n.apply(void 0,e)})},l=function(n){for(var t=arguments.length,e=Array(1<t?t-1:0),r=1;r<t;r++)e[r-1]=arguments[r];return m(n).reduce(function(n,t){return[t.apply(void 0,i(n))]},e).shift()},s=function(n){for(var t=arguments.length,e=Array(1<t?t-1:0),r=1;r<t;r++)e[r-1]=arguments[r];return m(n).pop().apply(void 0,e)};r({moduleSelector:function(n){return n.querySelectorAll("[data-module]")},moduleGetContext:function(n){return n.dataset.context},moduleImport:function(e){return new Promise(function(n,t){if(self[e])return n(self[e])})},moduleGetConstructor:function(n){return n},moduleGetDestructor:function(n){return n},moduleSetConstructorArguments:function(n,t){return[t]},moduleGetName:function(n){return n.dataset.module},monitor:{name:"media",create:function(n){return self.matchMedia(n)}}})});
\ No newline at end of file
+/* conditioner-core 2.3.3 */
+!function(n,t){if("function"==typeof define&&define.amd)define(["exports"],t);else if("undefined"!=typeof exports)t(exports);else{var e={};t(e),n.conditioner=e}}(this,function(n){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var u=function(n,t){if(Array.isArray(n))return n;if(Symbol.iterator in Object(n))return function(n,t){var e=[],r=!0,o=!1,u=void 0;try{for(var i,c=n[Symbol.iterator]();!(r=(i=c.next()).done)&&(e.push(i.value),!t||e.length!==t);r=!0);}catch(n){o=!0,u=n}finally{try{!r&&c.return&&c.return()}finally{if(o)throw u}}return e}(n,t);throw new TypeError("Invalid attempt to destructure non-iterable instance")};function i(n){if(Array.isArray(n)){for(var t=0,e=Array(n.length);t<n.length;t++)e[t]=n[t];return e}return Array.from(n)}function c(n){var t=n.match(a),e=u(t,5),r=e[1],o=e[2];return[e[3],function(n){return void 0===n||"true"===n||"false"!==n&&n}(e[4]),"not"===o,"was"===r]}function t(n){var t=function(t,n){var e=s("moduleGetName",t),r=l("moduleSetName",e),o={destruct:null,mounting:!1},u={alias:e,name:r,element:t,mounted:!1,unmount:function(){o.destruct&&u.mounted&&(d("moduleWillUnmount",u),o.destruct(),u.mounted=!1,d("moduleDidUnmount",u),u.onunmount.apply(t))},mount:function(){if(!u.mounted&&!o.mounting)return o.mounting=!0,d("moduleWillMount",u),s("moduleImport",r).then(function(n){o.destruct=s("moduleGetDestructor",s("moduleGetConstructor",n).apply(void 0,i(s("moduleSetConstructorArguments",r,t)))),o.mounting=!1,u.mounted=!0,d("moduleDidMount",u),u.onmount.apply(t,[u])}).catch(function(n){throw o.mounting=!1,d("moduleDidCatch",n,u),u.onmounterror.apply(t,[n,u]),new Error("Conditioner: "+n)}),u},destroy:function(){d("moduleWillDestroy",u),u.unmount(),d("moduleDidDestroy",u),u.ondestroy.apply(t),n()},onmounterror:function(){},onmount:function(){},onunmount:function(){},ondestroy:function(){}};return u}(n,function(){return r&&r.destroy()}),e=s("moduleGetContext",n),r=e&&function(n,t){var e=o(n,t.element);return e.onchange=function(n){return n?t.mount():t.unmount()},e.start(),e}(e,t);return e?t:t.mount()}var a=/(was)? ?(not)? ?@([a-z]+) ?(.*)?/,f=/(?:was )?(?:not )?@[a-z]+ ?.*?(?:(?= and (?:was )?(?:not )?@[a-z])|$)/g,o=n.monitor=function(n,t){var e={matches:!1,active:!1,onchange:function(){},start:function(){e.active||(e.active=!0,r.forEach(function(n){return n.forEach(function(n){return n.addListener(o)})}),o())},stop:function(){e.active=!1,r.forEach(function(n){return n.forEach(function(n){n.removeListener&&n.removeListener(o)})})},destroy:function(){e.stop(),r.length=0}},r=n.split(" or ").map(function(n){return function(n){return n.match(f).map(c)}(n).map(function(n){return function(n,t,e){return n.invert=t,n.retain=e,n.matched=!1,n}.apply(void 0,[function(n,t,e){return m("monitor").find(function(n){return n.name===t}).create(e,n)}.apply(void 0,[t].concat(i(n)))].concat(i(n.splice(2))))})}),o=function(){var n=r.reduce(function(n,t){return!!n||function(n){return n.reduce(function(n,t){if(!n)return!1;var e=t.invert?!t.matches:t.matches;return e&&(t.matched=!0),!(!t.retain||!t.matched)||e},!0)}(t)},!1);e.matches=n,e.onchange(n)};return e},e=(n.hydrate=function(n){return[].concat(i(s("moduleSelector",n))).map(t)},[]),r=n.addPlugin=function(n){return e.push(n)},m=function(t){return e.filter(function(n){return function(n,t){return-1<n.indexOf(t)}(Object.keys(n),t)}).map(function(n){return n[t]})},d=function(n){for(var t=arguments.length,e=Array(1<t?t-1:0),r=1;r<t;r++)e[r-1]=arguments[r];return m(n).forEach(function(n){return n.apply(void 0,e)})},l=function(n){for(var t=arguments.length,e=Array(1<t?t-1:0),r=1;r<t;r++)e[r-1]=arguments[r];return m(n).reduce(function(n,t){return[t.apply(void 0,i(n))]},e).shift()},s=function(n){for(var t=arguments.length,e=Array(1<t?t-1:0),r=1;r<t;r++)e[r-1]=arguments[r];return m(n).pop().apply(void 0,e)};r({moduleSelector:function(n){return n.querySelectorAll("[data-module]")},moduleGetContext:function(n){return n.dataset.context},moduleImport:function(e){return new Promise(function(n,t){if(self[e])return n(self[e])})},moduleGetConstructor:function(n){return n},moduleGetDestructor:function(n){return n},moduleSetConstructorArguments:function(n,t){return[t]},moduleGetName:function(n){return n.dataset.module},monitor:{name:"media",create:function(n){return self.matchMedia(n)}}})});
\ No newline at end of file
diff --git a/index.html b/index.html
index 08acd25..b5fbb2c 100644
--- a/index.html
+++ b/index.html
@@ -49,7 +49,7 @@
     Resize the window, when it's wider than 40em Conditioner will unmount the SectionToggler
     -->
 
-    <h2 data-module="sectionToggler" data-context="@media (max-width:40em)">Frizz free, context-aware, JavaScript modules</h2>
+    <h2 data-module="SectionToggler" data-context="@media (max-width:40em)">Frizz free, context-aware, JavaScript modules</h2>
     <div>
         
         <p>Building a content based website?</p>
@@ -64,10 +64,18 @@ <h2 data-module="sectionToggler" data-context="@media (max-width:40em)">Frizz fr
     
     </div>
 
+    <h2>Let's print "Hello World"</h2>
+    <p data-module="HelloWorld"></p>
+
     <script src="conditioner-core.min.js"></script>
     <script>
-    // Our Accessible Section toggler module
-    var sectionToggler = (element) => {
+    // Our Hello World module
+    function HelloWorld(element) {
+        element.textContent = 'Hello World';
+    };
+
+    // Our Section Toggler module
+    function SectionToggler(element) {
 
         // get section to toggle so we can hide it
         const target = element.nextElementSibling;
@@ -88,7 +96,7 @@ <h2 data-module="sectionToggler" data-context="@media (max-width:40em)">Frizz fr
         target.hidden = true;
         
         // clean up method
-        return () => {
+        return function() {
             element.nextElementSibling.hidden = false;
             element.textContent = element.firstChild.textContent;
         };
diff --git a/index.js b/index.js
index 318486a..2bb7096 100644
--- a/index.js
+++ b/index.js
@@ -288,7 +288,7 @@ const createModule = element => {
 	const query = runPlugin('moduleGetContext', element);
 
 	// wait for the right context or load the module immidiately if no context supplied
-	const monitor = createContextualModule(query, boundModule);
+	const monitor = query && createContextualModule(query, boundModule);
 
 	// return module
 	return query ? boundModule : boundModule.mount();
diff --git a/package.json b/package.json
index ac52a10..b823357 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "conditioner-core",
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"description": "Conditioner - Frizz free, context-aware, JavaScript modules",
 	"homepage": "https://pqina.nl/conditioner",
 	"main": "conditioner-core.js",