diff --git a/.gitignore b/.gitignore
index 09b97a6..e15288e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ bower_components
 #Icon?
 ehthumbs.db
 Thumbs.db
+app/styles/*.css
+app/styles/*.css.map
\ No newline at end of file
diff --git a/README.md b/README.md
index e1e3e99..ee6504f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Timetable.js
-Vanilla javascript plugin for building nice responsive timetables. Provides a simple javascript interface to add events and locations which can be rendered to nice HTML. Works on mobile devices as well.
+ Vanilla javascript plugin for building nice responsive timetables. Provides a simple javascript interface to add events and locations which can be rendered to nice HTML. Works on mobile devices as well.
 
 ## Just show me the demo
 Okay: [**demo**](http://timetablejs.grible.co). Also, have a look at the website: [http://timetablejs.org](http://timetablejs.org).
diff --git a/app/demo.html b/app/demo.html
index 197ae0c..07a23d2 100644
--- a/app/demo.html
+++ b/app/demo.html
@@ -28,10 +28,22 @@ <h1>Timetable.js demo</h1>
     <script>
       var timetable = new Timetable();
 
-      timetable.setScope(9,3)
+      timetable.setScope(9,3);
 
-      timetable.addLocations(['Rotterdam', 'Madrid', 'Los Angeles', 'London', 'New York', 'Jakarta', 'Tokyo']);
+      timetable.addLocations(['Rotterdam', 'Madrid']);
 
+      timetable.addLocations(
+              [
+                { id: 'Petersburg', title: 'St.Petersburg', href: 'http://www.visit-petersburg.ru/en/'},
+                { id: 'Los Angeles', title: 'Los Angeles'},
+                { id: 'London', title: 'London'},
+                { id: 'New York', title: 'New York'},
+                { id: 'Jakarta', title: 'Jakarta'},
+                { id: 'Tokyo', title: 'Tokyo'}
+              ]
+      );
+
+      timetable.addEvent('Beer party', 'Petersburg', new Date(2015,7,17,19,00), new Date(2015,7,18,08,00), { url: '#' });
       timetable.addEvent('Sightseeing', 'Rotterdam', new Date(2015,7,17,9,00), new Date(2015,7,17,11,30), { url: '#' });
       timetable.addEvent('Zumba', 'Madrid', new Date(2015,7,17,12), new Date(2015,7,17,13), { url: '#' });
       timetable.addEvent('Zumbu', 'Madrid', new Date(2015,7,17,13,30), new Date(2015,7,17,15), { url: '#' });
diff --git a/app/scripts/plugin.js b/app/scripts/plugin.js
index c7ecb6a..0c64fa1 100644
--- a/app/scripts/plugin.js
+++ b/app/scripts/plugin.js
@@ -29,10 +29,15 @@ Timetable.Renderer = function(tt) {
 		return number === parseInt(number, 10);
 	}
 	function isInHourRange(number) {
-		return number >= 0 && number < 24;
+		return number >= 0 && number < 25;
 	}
 	function locationExistsIn(loc, locs) {
-		return locs.indexOf(loc) !== -1;
+		for (var k=0; k<locs.length; k++) {
+			if (loc === locs[k].id) {
+				return true;
+			}
+		}
+		return false;
 	}
 	function isValidTimeRange(start, end) {
 		var correctTypes = start instanceof Date && end instanceof Date;
@@ -40,7 +45,7 @@ Timetable.Renderer = function(tt) {
 		return correctTypes && correctOrder;
 	}
 	function getDurationHours(startHour, endHour) {
-		return endHour >= startHour ? endHour - startHour : 24 + endHour - startHour;
+		return endHour >= startHour ? endHour - startHour : 25 + endHour - startHour;
 	}
 
 	Timetable.prototype = {
@@ -49,19 +54,34 @@ Timetable.Renderer = function(tt) {
 				this.scope.hourStart = start;
 				this.scope.hourEnd = end;
 			} else {
-				throw new RangeError('Timetable scope should consist of (start, end) in whole hours from 0 to 23');
+				throw new RangeError('Timetable scope should consist of (start, end) in whole hours from 0 to 24');
 			}
 
 			return this;
 		},
 		addLocations: function(newLocations) {
 			function hasProperFormat() {
-				return newLocations instanceof Array;
+				return newLocations instanceof Array && typeof newLocations[0] === 'string';
+			}
+
+			function hasExtendFormat() {
+				return newLocations instanceof Array && newLocations[0] instanceof Object;
 			}
 
 			var existingLocations = this.locations;
 
 			if (hasProperFormat()) {
+				newLocations.forEach(function(loc) {
+					if (!locationExistsIn(loc, existingLocations)) {
+						existingLocations.push({
+							id: loc,
+							title: loc
+						});
+					} else {
+						throw new Error('Location already exists');
+					}
+				});
+			} else if (hasExtendFormat()) {
 				newLocations.forEach(function(loc) {
 					if (!locationExistsIn(loc, existingLocations)) {
 						existingLocations.push(loc);
@@ -69,7 +89,8 @@ Timetable.Renderer = function(tt) {
 						throw new Error('Location already exists');
 					}
 				});
-			} else {
+			}
+			else {
 				throw new Error('Tried to add locations in wrong format');
 			}
 
@@ -80,7 +101,8 @@ Timetable.Renderer = function(tt) {
 				throw new Error('Unknown location');
 			}
 			if (!isValidTimeRange(start, end)) {
-				throw new Error('Invalid time range: ' + JSON.stringify([start, end]));
+				console.log('Invalid time range: ' + JSON.stringify([start, end]));
+				return;
 			}
 
 			var optionsHasValidType = Object.prototype.toString.call(options) === '[object Object]';
@@ -122,10 +144,16 @@ Timetable.Renderer = function(tt) {
 			}
 			function appendRowHeaders(ulNode) {
 				for (var k=0; k<timetable.locations.length; k++) {
+					var url = timetable.locations[k].href;
 					var liNode = ulNode.appendChild(document.createElement('li'));
 					var spanNode = liNode.appendChild(document.createElement('span'));
+					if (url !== undefined) {
+						var aNode = liNode.appendChild(document.createElement('a'));
+						aNode.href = timetable.locations[k].href;
+						aNode.appendChild(spanNode);
+					}
 					spanNode.className = 'row-heading';
-					spanNode.textContent = timetable.locations[k];
+					spanNode.textContent = timetable.locations[k].title;
 				}
 			}
 			function appendTimetableSection(container) {
@@ -150,7 +178,7 @@ Timetable.Renderer = function(tt) {
 					if (hour === timetable.scope.hourEnd && (timetable.scope.hourStart !== timetable.scope.hourEnd || looped)) {
 						completed = true;
 					}
-					if (++hour === 24) {
+					if (++hour === 25) {
 						hour = 0;
 						looped = true;
 					}
@@ -167,7 +195,7 @@ Timetable.Renderer = function(tt) {
 			function appendLocationEvents(location, node) {
 				for (var k=0; k<timetable.events.length; k++) {
 					var event = timetable.events[k];
-					if (event.location === location) {
+					if (event.location === location.id) {
 						appendEvent(event, node);
 					}
 				}
@@ -177,9 +205,9 @@ Timetable.Renderer = function(tt) {
 				var hasURL, hasAdditionalClass, hasDataAttributes = false;
 
 				if(hasOptions) {
-					hasURL = (event.options.url !== undefined) ? true : false;
-					hasAdditionalClass = (event.options.class !== undefined) ? true : false;
-					hasDataAttributes = (event.options.data !== undefined) ? true : false;
+					hasURL = event.options.url !== undefined;
+					hasAdditionalClass = event.options.class !== undefined;
+					hasDataAttributes = event.options.data !== undefined;
 				}
 
 				var elementType = hasURL ? 'a' : 'span';
diff --git a/app/styles/demo.sass b/app/styles/demo.sass
index a56cfca..ffac001 100644
--- a/app/styles/demo.sass
+++ b/app/styles/demo.sass
@@ -1,8 +1,8 @@
 body
-  background: #fcfcfc
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif
-  color: #333
-  font-size: 15px
+	background: #fcfcfc
+	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif
+	color: #333
+	font-size: 15px
 
 a
 	text-decoration: none
diff --git a/dist/demo.html b/dist/demo.html
index 8e3f32e..dbcccc8 100644
--- a/dist/demo.html
+++ b/dist/demo.html
@@ -22,10 +22,22 @@ <h1>Timetable.js demo</h1>
     <script>
       var timetable = new Timetable();
 
-      timetable.setScope(9,3)
+      timetable.setScope(9,3);
 
-      timetable.addLocations(['Rotterdam', 'Madrid', 'Los Angeles', 'London', 'New York', 'Jakarta', 'Tokyo']);
+      timetable.addLocations(['Rotterdam', 'Madrid']);
 
+      timetable.addLocations(
+              [
+                { id: 'Petersburg', title: 'St.Petersburg', href: 'http://www.visit-petersburg.ru/en/'},
+                { id: 'Los Angeles', title: 'Los Angeles'},
+                { id: 'London', title: 'London'},
+                { id: 'New York', title: 'New York'},
+                { id: 'Jakarta', title: 'Jakarta'},
+                { id: 'Tokyo', title: 'Tokyo'}
+              ]
+      );
+
+      timetable.addEvent('Beer party', 'Petersburg', new Date(2015,7,17,19,00), new Date(2015,7,18,08,00), { url: '#' });
       timetable.addEvent('Sightseeing', 'Rotterdam', new Date(2015,7,17,9,00), new Date(2015,7,17,11,30), { url: '#' });
       timetable.addEvent('Zumba', 'Madrid', new Date(2015,7,17,12), new Date(2015,7,17,13), { url: '#' });
       timetable.addEvent('Zumbu', 'Madrid', new Date(2015,7,17,13,30), new Date(2015,7,17,15), { url: '#' });
diff --git a/dist/scripts/timetable.js b/dist/scripts/timetable.js
index c7ecb6a..0c64fa1 100644
--- a/dist/scripts/timetable.js
+++ b/dist/scripts/timetable.js
@@ -29,10 +29,15 @@ Timetable.Renderer = function(tt) {
 		return number === parseInt(number, 10);
 	}
 	function isInHourRange(number) {
-		return number >= 0 && number < 24;
+		return number >= 0 && number < 25;
 	}
 	function locationExistsIn(loc, locs) {
-		return locs.indexOf(loc) !== -1;
+		for (var k=0; k<locs.length; k++) {
+			if (loc === locs[k].id) {
+				return true;
+			}
+		}
+		return false;
 	}
 	function isValidTimeRange(start, end) {
 		var correctTypes = start instanceof Date && end instanceof Date;
@@ -40,7 +45,7 @@ Timetable.Renderer = function(tt) {
 		return correctTypes && correctOrder;
 	}
 	function getDurationHours(startHour, endHour) {
-		return endHour >= startHour ? endHour - startHour : 24 + endHour - startHour;
+		return endHour >= startHour ? endHour - startHour : 25 + endHour - startHour;
 	}
 
 	Timetable.prototype = {
@@ -49,19 +54,34 @@ Timetable.Renderer = function(tt) {
 				this.scope.hourStart = start;
 				this.scope.hourEnd = end;
 			} else {
-				throw new RangeError('Timetable scope should consist of (start, end) in whole hours from 0 to 23');
+				throw new RangeError('Timetable scope should consist of (start, end) in whole hours from 0 to 24');
 			}
 
 			return this;
 		},
 		addLocations: function(newLocations) {
 			function hasProperFormat() {
-				return newLocations instanceof Array;
+				return newLocations instanceof Array && typeof newLocations[0] === 'string';
+			}
+
+			function hasExtendFormat() {
+				return newLocations instanceof Array && newLocations[0] instanceof Object;
 			}
 
 			var existingLocations = this.locations;
 
 			if (hasProperFormat()) {
+				newLocations.forEach(function(loc) {
+					if (!locationExistsIn(loc, existingLocations)) {
+						existingLocations.push({
+							id: loc,
+							title: loc
+						});
+					} else {
+						throw new Error('Location already exists');
+					}
+				});
+			} else if (hasExtendFormat()) {
 				newLocations.forEach(function(loc) {
 					if (!locationExistsIn(loc, existingLocations)) {
 						existingLocations.push(loc);
@@ -69,7 +89,8 @@ Timetable.Renderer = function(tt) {
 						throw new Error('Location already exists');
 					}
 				});
-			} else {
+			}
+			else {
 				throw new Error('Tried to add locations in wrong format');
 			}
 
@@ -80,7 +101,8 @@ Timetable.Renderer = function(tt) {
 				throw new Error('Unknown location');
 			}
 			if (!isValidTimeRange(start, end)) {
-				throw new Error('Invalid time range: ' + JSON.stringify([start, end]));
+				console.log('Invalid time range: ' + JSON.stringify([start, end]));
+				return;
 			}
 
 			var optionsHasValidType = Object.prototype.toString.call(options) === '[object Object]';
@@ -122,10 +144,16 @@ Timetable.Renderer = function(tt) {
 			}
 			function appendRowHeaders(ulNode) {
 				for (var k=0; k<timetable.locations.length; k++) {
+					var url = timetable.locations[k].href;
 					var liNode = ulNode.appendChild(document.createElement('li'));
 					var spanNode = liNode.appendChild(document.createElement('span'));
+					if (url !== undefined) {
+						var aNode = liNode.appendChild(document.createElement('a'));
+						aNode.href = timetable.locations[k].href;
+						aNode.appendChild(spanNode);
+					}
 					spanNode.className = 'row-heading';
-					spanNode.textContent = timetable.locations[k];
+					spanNode.textContent = timetable.locations[k].title;
 				}
 			}
 			function appendTimetableSection(container) {
@@ -150,7 +178,7 @@ Timetable.Renderer = function(tt) {
 					if (hour === timetable.scope.hourEnd && (timetable.scope.hourStart !== timetable.scope.hourEnd || looped)) {
 						completed = true;
 					}
-					if (++hour === 24) {
+					if (++hour === 25) {
 						hour = 0;
 						looped = true;
 					}
@@ -167,7 +195,7 @@ Timetable.Renderer = function(tt) {
 			function appendLocationEvents(location, node) {
 				for (var k=0; k<timetable.events.length; k++) {
 					var event = timetable.events[k];
-					if (event.location === location) {
+					if (event.location === location.id) {
 						appendEvent(event, node);
 					}
 				}
@@ -177,9 +205,9 @@ Timetable.Renderer = function(tt) {
 				var hasURL, hasAdditionalClass, hasDataAttributes = false;
 
 				if(hasOptions) {
-					hasURL = (event.options.url !== undefined) ? true : false;
-					hasAdditionalClass = (event.options.class !== undefined) ? true : false;
-					hasDataAttributes = (event.options.data !== undefined) ? true : false;
+					hasURL = event.options.url !== undefined;
+					hasAdditionalClass = event.options.class !== undefined;
+					hasDataAttributes = event.options.data !== undefined;
 				}
 
 				var elementType = hasURL ? 'a' : 'span';
diff --git a/dist/scripts/timetable.min.js b/dist/scripts/timetable.min.js
index 8ee4fab..bdba29c 100644
--- a/dist/scripts/timetable.min.js
+++ b/dist/scripts/timetable.min.js
@@ -1 +1 @@
-"use strict";var Timetable=function(){this.scope={hourStart:9,hourEnd:17},this.locations=[],this.events=[]};Timetable.Renderer=function(t){if(!(t instanceof Timetable))throw new Error("Initialize renderer using a Timetable");this.timetable=t},function(){function t(t,n){return e(t)&&e(n)}function e(t){return n(t)&&o(t)}function n(t){return t===parseInt(t,10)}function o(t){return t>=0&&t<24}function r(t,e){return e.indexOf(t)!==-1}function i(t,e){var n=t instanceof Date&&e instanceof Date,o=t<e;return n&&o}function a(t,e){return e>=t?e-t:24+e-t}function c(t){for(;t.firstChild;)t.removeChild(t.firstChild)}function s(t){var e=t<10?"0":"";return e+t+":00"}Timetable.prototype={setScope:function(e,n){if(!t(e,n))throw new RangeError("Timetable scope should consist of (start, end) in whole hours from 0 to 23");return this.scope.hourStart=e,this.scope.hourEnd=n,this},addLocations:function(t){function e(){return t instanceof Array}var n=this.locations;if(!e())throw new Error("Tried to add locations in wrong format");return t.forEach(function(t){if(r(t,n))throw new Error("Location already exists");n.push(t)}),this},addEvent:function(t,e,n,o,a){if(!r(e,this.locations))throw new Error("Unknown location");if(!i(n,o))throw new Error("Invalid time range: "+JSON.stringify([n,o]));var c="[object Object]"===Object.prototype.toString.call(a);return this.events.push({name:t,location:e,startDate:n,endDate:o,options:c?a:void 0}),this}},Timetable.Renderer.prototype={draw:function(t){function e(t){if(null===t)throw new Error("Timetable container not found")}function n(t){var e=t.appendChild(document.createElement("aside")),n=e.appendChild(document.createElement("ul"));o(n)}function o(t){for(var e=0;e<f.locations.length;e++){var n=t.appendChild(document.createElement("li")),o=n.appendChild(document.createElement("span"));o.className="row-heading",o.textContent=f.locations[e]}}function r(t){var e=t.appendChild(document.createElement("section")),n=e.appendChild(document.createElement("time"));i(n),l(n)}function i(t){for(var e=t.appendChild(document.createElement("header")),n=e.appendChild(document.createElement("ul")),o=!1,r=!1,i=f.scope.hourStart;!o;){var a=n.appendChild(document.createElement("li")),c=a.appendChild(document.createElement("span"));c.className="time-label",c.textContent=s(i),i!==f.scope.hourEnd||f.scope.hourStart===f.scope.hourEnd&&!r||(o=!0),24===++i&&(i=0,r=!0)}}function l(t){var e=t.appendChild(document.createElement("ul"));e.className="room-timeline";for(var n=0;n<f.locations.length;n++){var o=e.appendChild(document.createElement("li"));u(f.locations[n],o)}}function u(t,e){for(var n=0;n<f.events.length;n++){var o=f.events[n];o.location===t&&d(o,e)}}function d(t,e){var n,o,r=void 0!==t.options,i=!1;r&&(n=void 0!==t.options.url,o=void 0!==t.options["class"],i=void 0!==t.options.data);var a=n?"a":"span",c=e.appendChild(document.createElement(a)),s=c.appendChild(document.createElement("small"));if(c.title=t.name,n&&(c.href=t.options.url),i)for(var l in t.options.data)c.setAttribute("data-"+l,t.options.data[l]);c.className=o?"time-entry "+t.options["class"]:"time-entry",c.style.width=h(t),c.style.left=m(t),s.textContent=t.name}function h(t){var e=t.startDate,n=t.endDate,o=p(e,n);return o/v*100+"%"}function p(t,e){return(e.getTime()-t.getTime())/1e3/60/60}function m(t){var e=f.scope.hourStart,n=t.startDate.getHours()+t.startDate.getMinutes()/60,o=a(e,n);return o/v*100+"%"}var f=this.timetable,v=a(f.scope.hourStart,f.scope.hourEnd),E=document.querySelector(t);e(E),c(E),n(E),r(E)}}}();
\ No newline at end of file
+"use strict";var Timetable=function(){this.scope={hourStart:9,hourEnd:17},this.locations=[],this.events=[]};Timetable.Renderer=function(t){if(!(t instanceof Timetable))throw new Error("Initialize renderer using a Timetable");this.timetable=t},function(){function t(t,n){return e(t)&&e(n)}function e(t){return n(t)&&o(t)}function n(t){return t===parseInt(t,10)}function o(t){return t>=0&&t<25}function r(t,e){for(var n=0;n<e.length;n++)if(t===e[n].id)return!0;return!1}function i(t,e){var n=t instanceof Date&&e instanceof Date,o=t<e;return n&&o}function a(t,e){return e>=t?e-t:25+e-t}function c(t){for(;t.firstChild;)t.removeChild(t.firstChild)}function s(t){var e=t<10?"0":"";return e+t+":00"}Timetable.prototype={setScope:function(e,n){if(!t(e,n))throw new RangeError("Timetable scope should consist of (start, end) in whole hours from 0 to 24");return this.scope.hourStart=e,this.scope.hourEnd=n,this},addLocations:function(t){function e(){return t instanceof Array&&"string"==typeof t[0]}function n(){return t instanceof Array&&t[0]instanceof Object}var o=this.locations;if(e())t.forEach(function(t){if(r(t,o))throw new Error("Location already exists");o.push({id:t,title:t})});else{if(!n())throw new Error("Tried to add locations in wrong format");t.forEach(function(t){if(r(t,o))throw new Error("Location already exists");o.push(t)})}return this},addEvent:function(t,e,n,o,a){if(!r(e,this.locations))throw new Error("Unknown location");if(!i(n,o))throw new Error("Invalid time range: "+JSON.stringify([n,o]));var c="[object Object]"===Object.prototype.toString.call(a);return this.events.push({name:t,location:e,startDate:n,endDate:o,options:c?a:void 0}),this}},Timetable.Renderer.prototype={draw:function(t){function e(t){if(null===t)throw new Error("Timetable container not found")}function n(t){var e=t.appendChild(document.createElement("aside")),n=e.appendChild(document.createElement("ul"));o(n)}function o(t){for(var e=0;e<m.locations.length;e++){var n=m.locations[e].href,o=t.appendChild(document.createElement("li")),r=o.appendChild(document.createElement("span"));if(void 0!==n){var i=o.appendChild(document.createElement("a"));i.href=m.locations[e].href,i.appendChild(r)}r.className="row-heading",r.textContent=m.locations[e].title}}function r(t){var e=t.appendChild(document.createElement("section")),n=e.appendChild(document.createElement("time"));i(n),l(n)}function i(t){for(var e=t.appendChild(document.createElement("header")),n=e.appendChild(document.createElement("ul")),o=!1,r=!1,i=m.scope.hourStart;!o;){var a=n.appendChild(document.createElement("li")),c=a.appendChild(document.createElement("span"));c.className="time-label",c.textContent=s(i),i!==m.scope.hourEnd||m.scope.hourStart===m.scope.hourEnd&&!r||(o=!0),25===++i&&(i=0,r=!0)}}function l(t){var e=t.appendChild(document.createElement("ul"));e.className="room-timeline";for(var n=0;n<m.locations.length;n++){var o=e.appendChild(document.createElement("li"));u(m.locations[n],o)}}function u(t,e){for(var n=0;n<m.events.length;n++){var o=m.events[n];o.location===t.id&&d(o,e)}}function d(t,e){var n,o,r=void 0!==t.options,i=!1;r&&(n=void 0!==t.options.url,o=void 0!==t.options["class"],i=void 0!==t.options.data);var a=n?"a":"span",c=e.appendChild(document.createElement(a)),s=c.appendChild(document.createElement("small"));if(c.title=t.name,n&&(c.href=t.options.url),i)for(var l in t.options.data)c.setAttribute("data-"+l,t.options.data[l]);c.className=o?"time-entry "+t.options["class"]:"time-entry",c.style.width=f(t),c.style.left=p(t),s.textContent=t.name}function f(t){var e=t.startDate,n=t.endDate,o=h(e,n);return o/v*100+"%"}function h(t,e){return(e.getTime()-t.getTime())/1e3/60/60}function p(t){var e=m.scope.hourStart,n=t.startDate.getHours()+t.startDate.getMinutes()/60,o=a(e,n);return o/v*100+"%"}var m=this.timetable,v=a(m.scope.hourStart,m.scope.hourEnd),E=document.querySelector(t);e(E),c(E),n(E),r(E)}}}();
\ No newline at end of file
diff --git a/dist/styles/demo.css b/dist/styles/demo.css
index f88b895..7aa6401 100644
--- a/dist/styles/demo.css
+++ b/dist/styles/demo.css
@@ -1 +1 @@
-body{background:#fcfcfc;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333;font-size:15px}a{text-decoration:none}.row-heading{font-weight:500;font-size:.7em;text-transform:uppercase}.timetable .time-label{font-size:.8em;font-weight:500}.timetable .time-entry.vip-only{background-color:#C490F5;border:1px solid #6A16B8}.timetable .time-entry.vip-only:hover{background-color:#AE67F0}
\ No newline at end of file
+body{background:#fcfcfc;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;color:#333;font-size:15px}a{text-decoration:none}.row-heading{font-weight:500;font-size:.7em;text-transform:uppercase}.timetable .time-label{font-size:.8em;font-weight:500}.timetable .time-entry.vip-only{background-color:#C490F5;border:1px solid #6A16B8}.timetable .time-entry.vip-only:hover{background-color:#AE67F0}
\ No newline at end of file
diff --git a/dist/styles/timetablejs.css b/dist/styles/timetablejs.css
index 9cee29d..fd15b2d 100644
--- a/dist/styles/timetablejs.css
+++ b/dist/styles/timetablejs.css
@@ -1 +1 @@
-.timetable{box-sizing:border-box}.timetable::after{clear:both;content:"";display:table}.timetable *,.timetable *:before,.timetable *:after{box-sizing:inherit}.timetable ul,.timetable li{margin:0;padding:0;list-style-type:none}.timetable aside,.timetable section{float:left}.timetable aside{width:25%;padding:0!important;margin-top:46px;border-right:5px solid transparent}.timetable aside li{padding:0 15px;background-color:#EFEFEF;line-height:46px}.timetable aside li:not(:last-of-type){border-bottom:1px solid #fff}.timetable aside .row-heading{display:inline-block;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal}.timetable ul{list-style-type:none;margin:0}.timetable aside li,.timetable time li{height:46px}.timetable section{width:75%;padding:0!important;overflow-x:scroll;-webkit-overflow-scrolling:touch}.timetable section time{white-space:nowrap;display:inline-block}.timetable section header{height:46px;transform-style:preserve-3d;font-size:0}.timetable section header::after{clear:both;content:"";display:table}.timetable section header li{display:inline-block;font-size:1rem;overflow:visible;width:0;line-height:46px;display:inline-block;position:relative}.timetable section header li:not(:last-of-type){width:96px}.timetable section header li .time-label{display:block;position:absolute;left:0}.timetable section header li:not(:first-of-type) .time-label{transform:translateX(-50%)}.timetable section header li:last-of-type .time-label{transform:translateX(-100%)}@media only screen and (max-width:960px){.timetable aside{width:40%}.timetable section{width:60%}}.timetable ul.room-timeline{border-left:none;position:relative;overflow:hidden}.timetable ul.room-timeline li{position:relative;background-color:#F4F4F4}.timetable ul.room-timeline li:nth-of-type(odd){background-color:#FDFDFD}.timetable ul.room-timeline li:first-of-type{border-top:1px solid #E5E5E5}.timetable ul.room-timeline li:last-of-type{border-bottom:1px solid #E5E5E5}.timetable ul.room-timeline li:not(:last-of-type){border-bottom:none}.timetable ul.room-timeline li:first-child .time-entry{height:44px}.timetable ul.room-timeline li:after,.timetable ul.room-timeline li:before{content:"";position:absolute;z-index:1;left:0;top:0;right:0;bottom:0}.timetable ul.room-timeline li:before{background-image:linear-gradient(to right,#E5E5E5 1px,transparent 1px);background-size:24px auto}.timetable ul.room-timeline li:after{background-image:linear-gradient(to right,#E5E5E5,#E5E5E5 1px,#F4F4F4 1px,#F4F4F4 2px,#E5E5E5 2px,#E5E5E5 3px,transparent 3px,transparent);background-size:96px auto;background-position:-2px 0}.timetable .time-entry{background-color:#EC6A5E;transition:200ms background-color;height:45px;display:block;position:absolute;z-index:2;padding:0 10px;white-space:normal;overflow:hidden;color:#fff;border:1px solid #e32c1b;transform-style:preserve-3d}.timetable .time-entry small{position:relative;top:50%;transform:translateY(-50%);display:block}.timetable .time-entry:hover{background-color:#e74030}
\ No newline at end of file
+.timetable::after{display:table}.timetable aside .row-heading,.timetable section time{display:inline-block}.timetable section header::after{display:table}.timetable section header li{display:inline-block;display:inline-block}.timetable section header li .time-label{display:block}@media only screen and (max-width:960px){.timetable aside{width:40%}.timetable section{width:60%}}.timetable .time-entry,.timetable .time-entry small{display:block}.timetable{box-sizing:border-box}.timetable::after{clear:both;content:"";display:table}.timetable *,.timetable *:before,.timetable *:after{box-sizing:inherit}.timetable ul{padding:0}.timetable li{margin:0;padding:0;list-style-type:none}.timetable aside,.timetable section{float:left}.timetable aside{width:25%;padding:0!important;margin-top:46px;border-right:5px solid transparent}.timetable aside li{padding:0 15px;background-color:#EFEFEF;line-height:46px}.timetable aside li:not(:last-of-type){border-bottom:1px solid #fff}.timetable aside .row-heading{display:inline-block;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal}.timetable ul{list-style-type:none;margin:0}.timetable aside li,.timetable time li{height:46px}.timetable section{width:75%;padding:0!important;overflow-x:scroll;-webkit-overflow-scrolling:touch}.timetable section time{white-space:nowrap;display:inline-block}.timetable section header{height:46px;transform-style:preserve-3d;font-size:0}.timetable section header::after{clear:both;content:"";display:table}.timetable section header li{display:inline-block;font-size:1rem;overflow:visible;width:0;line-height:46px;display:inline-block;position:relative}.timetable section header li:not(:last-of-type){width:96px}.timetable section header li .time-label{display:block;position:absolute;left:0}.timetable section header li:not(:first-of-type) .time-label{transform:translateX(-50%)}.timetable section header li:last-of-type .time-label{transform:translateX(-100%)}@media only screen and (max-width:960px){.timetable aside{width:40%}.timetable section{width:60%}}.timetable ul.room-timeline{border-left:none;position:relative;overflow:hidden}.timetable ul.room-timeline li{position:relative;background-color:#F4F4F4}.timetable ul.room-timeline li:nth-of-type(odd){background-color:#FDFDFD}.timetable ul.room-timeline li:first-of-type{border-top:1px solid #E5E5E5}.timetable ul.room-timeline li:last-of-type{border-bottom:1px solid #E5E5E5}.timetable ul.room-timeline li:not(:last-of-type){border-bottom:none}.timetable ul.room-timeline li:first-child .time-entry{height:44px}.timetable ul.room-timeline li:after,.timetable ul.room-timeline li:before{content:"";position:absolute;z-index:1;left:0;top:0;right:0;bottom:0}.timetable ul.room-timeline li:before{background-image:linear-gradient(to right,#E5E5E5 1px,transparent 1px);background-size:24px auto}.timetable ul.room-timeline li:after{background-image:linear-gradient(to right,#E5E5E5,#E5E5E5 1px,#F4F4F4 1px,#F4F4F4 2px,#E5E5E5 2px,#E5E5E5 3px,transparent 3px,transparent);background-size:96px auto;background-position:-2px 0}.timetable .time-entry{background-color:#EC6A5E;transition:200ms background-color;height:45px;display:block;position:absolute;z-index:2;padding:0 10px;white-space:normal;overflow:hidden;color:#fff;border:1px solid #e32c1b;transform-style:preserve-3d}.timetable .time-entry small{position:relative;top:50%;transform:translateY(-50%);display:block}.timetable .time-entry:hover{background-color:#e74030}
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index d6c37a8..e734a11 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -62,13 +62,13 @@ gulp.task('images', function () {
     .pipe(gulp.dest('dist/images'));
 });
 
-gulp.task('fonts', function () {
-  return gulp.src(require('main-bower-files')({
-    filter: '**/*.{eot,svg,ttf,woff,woff2}'
-  }).concat('app/fonts/**/*'))
-    .pipe(gulp.dest('.tmp/fonts'))
-    .pipe(gulp.dest('dist/fonts'));
-});
+//gulp.task('fonts', function () {
+//  return gulp.src(require('main-bower-files')({
+//    filter: '**/*.{eot,svg,ttf,woff,woff2}'
+//  }).concat('app/fonts/**/*'))
+//    .pipe(gulp.dest('.tmp/fonts'))
+//    .pipe(gulp.dest('dist/fonts'));
+//});
 
 gulp.task('extras', function () {
   return gulp.src([
@@ -123,7 +123,7 @@ gulp.task('wiredep', function () {
     .pipe(gulp.dest('app'));
 });
 
-gulp.task('build', ['jshint', 'html', 'scripts', 'images', 'fonts', 'extras'], function () {
+gulp.task('build', ['jshint', 'html', 'scripts', 'images', 'extras'], function () {
   return gulp.src('dist/**/*').pipe($.size({title: 'build', gzip: true}));
 });
 
diff --git a/test/spec/plugin.js b/test/spec/plugin.js
index 97bd1c5..af4c3ae 100644
--- a/test/spec/plugin.js
+++ b/test/spec/plugin.js
@@ -12,11 +12,11 @@
     });
 
     it('should allow to set its scope in hours with maximum 24 hours span', function () {
-      var errorMsg = 'Timetable scope should consist of (start, end) in whole hours from 0 to 23';
+      var errorMsg = 'Timetable scope should consist of (start, end) in whole hours from 0 to 24';
       var tt = this.timetable;
       expect(tt.setScope(1, 20).scope).to.deep.equal({hourStart: 1, hourEnd: 20});
       expect(tt.setScope(0, 0).scope).to.deep.equal({hourStart: 0, hourEnd: 0});
-      expect(function(){tt.setScope(1, 24);}).to.throw(RangeError, errorMsg);
+      expect(function(){tt.setScope(1, 25);}).to.throw(RangeError, errorMsg);
       expect(function(){tt.setScope(-1, 1);}).to.throw(RangeError, errorMsg);
       expect(function(){tt.setScope(1, 0);}).not.to.throw(RangeError, errorMsg);
       expect(function(){tt.setScope(3, 1);}).not.to.throw(RangeError, errorMsg);