diff --git a/bower.json b/bower.json
index 310b5f2..cd470ef 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-json-editor",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "authors": [
         "Rodik Hanukaev <rodik@rodik.me>",
         "Topaz Bar <topaz1008@gmail.com>"
diff --git a/demo/index.html b/demo/index.html
index c33e692..923a6ab 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -13,7 +13,12 @@
 
 <h2>Synchronous values</h2>
 <div class="container" ng-controller="SyncAppController">
-    <json-editor schema="mySchema" startval="myStartVal" buttons-controller="SyncButtonsController" on-change="onChange($editorValue)">
+    <json-editor schema="mySchema" startval="myStartVal" on-change="onChange($editorValue)"></json-editor>
+</div>
+
+<h2>Buttons Controller</h2>
+<div class="container" ng-controller="SyncAppController">
+    <json-editor schema="mySchema" startval="myStartVal" buttons-controller="SyncButtonsController">
 
         <button type="submit" class="btn btn-success" ng-click="onSubmit($event)" ng-disabled="!isValid">
             <span class="glyphicon glyphicon-check"></span>
diff --git a/dist/angular-json-editor.min.js b/dist/angular-json-editor.min.js
index 89cf57d..4b35e07 100644
--- a/dist/angular-json-editor.min.js
+++ b/dist/angular-json-editor.min.js
@@ -1,2 +1,2 @@
-// angular-json-editor v0.1.4
-!function(a,b){"use strict";b.module("angular-json-editor",[]).constant("JsonEditorConfig",{iconlib:"bootstrap3",theme:"bootstrap3"}).provider("JSONEditor",function(){var a={};this.configure=function(c){b.extend(a,c)},this.$get=function(c){var d=c.JSONEditor;return b.extend(d,a),c.JSONEditor}}).directive("jsonEditor",["$q","JsonEditorConfig","JSONEditor",function(a,c,d){return{restrict:"E",transclude:!0,scope:{schema:"=",startval:"=",buttonsController:"@",onChange:"&"},controller:["$scope","$attrs","$controller",function(a,c,d){var e,f,g=c.buttonsController;if(!b.isString(g)||""===g)throw new Error("json-editor: buttons-controller attribute must be specified.");f={$scope:a};try{e=d(g,f)}catch(h){throw new Error("json-editor: buttons-controller attribute must be a valid controller.")}}],link:function(e,f,g,h,i){var j,k=a.when({}),l=a.when(null);if(e.isValid=!1,!b.isString(g.schema))throw new Error("json-editor: schema attribute has to be defined.");b.isObject(e.schema)&&(l=a.when(e.schema)),b.isObject(e.startval)&&(j=e.startval,k=a.when(b.isDefined(j.$promise)?j.$promise:j)),a.all([l,k]).then(function(a){var g=a[0].data||a[0],h=a[1];if(null===g)throw new Error("json-editor: could not resolve schema data.");b.extend(c,{startval:h,schema:g}),e.editor=new d(f[0],c);var j=e.editor;j.on("ready",function(){e.isValid=0===j.validate().length}),j.on("change",function(){"function"==typeof e.onChange&&e.onChange({$editorValue:j.getValue()}),e.$apply(function(){e.isValid=0===j.validate().length})});var k=i(e,function(a){return a});f.append(k)})}}}])}(window,angular);
\ No newline at end of file
+// angular-json-editor v0.1.6
+!function(a,b){"use strict";b.module("angular-json-editor",[]).provider("JSONEditor",function(){function a(c){return b.forEach(arguments,function(d){d!==c&&b.forEach(d,function(b,d){c[d]&&c[d].constructor&&c[d].constructor===Object?a(c[d],b):c[d]=b})}),c}var c={defaults:{options:{iconlib:"bootstrap3",theme:"bootstrap3"}}};this.configure=function(b){a(c,b)},this.$get=function(b){var d=b.JSONEditor;return a(d,c),b.JSONEditor}}).directive("jsonEditor",["$q","JSONEditor",function(a,c){return{restrict:"E",transclude:!0,scope:{schema:"=",startval:"=",buttonsController:"@",onChange:"&"},controller:["$scope","$attrs","$controller",function(a,c,d){var e,f,g=c.buttonsController;if(b.isString(g)&&""!==g){f={$scope:a};try{e=d(g,f)}catch(h){throw new Error("json-editor: buttons-controller attribute must be a valid controller.")}}}],link:function(d,e,f,g,h){var i,j=a.when({}),k=a.when(null);if(d.isValid=!1,!b.isString(f.schema))throw new Error("json-editor: schema attribute has to be defined.");b.isObject(d.schema)&&(k=a.when(d.schema)),b.isObject(d.startval)&&(i=d.startval,j=a.when(b.isDefined(i.$promise)?i.$promise:i)),a.all([k,j]).then(function(a){var b=a[0].data||a[0],f=a[1];if(null===b)throw new Error("json-editor: could not resolve schema data.");d.editor=new c(e[0],{startval:f,schema:b});var g=d.editor;g.on("ready",function(){d.isValid=0===g.validate().length}),g.on("change",function(){"function"==typeof d.onChange&&d.onChange({$editorValue:g.getValue()}),d.$apply(function(){d.isValid=0===g.validate().length})});var i=h(d,function(a){return a});e.append(i)})}}}])}(window,angular);
\ No newline at end of file
diff --git a/package.json b/package.json
index a9faac0..7734d30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-json-editor",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "repository": {
         "type": "git",
         "url": "git://github.com/rodikh/angular-json-editor.git"
diff --git a/src/angular-json-editor.js b/src/angular-json-editor.js
index 0b2a38f..efcfd46 100644
--- a/src/angular-json-editor.js
+++ b/src/angular-json-editor.js
@@ -35,7 +35,6 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
         return dst;
     }
 
-
 }).directive('jsonEditor', ['$q', 'JSONEditor', function ($q, JSONEditor) {
 
     return {
@@ -61,8 +60,6 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
                     // Any exceptions thrown will probably be because the controller specified does not exist
                     throw new Error('json-editor: buttons-controller attribute must be a valid controller.');
                 }
-            } else {
-                throw new Error('json-editor: buttons-controller attribute must be specified.');
             }
 
         }],