diff --git a/Gruntfile.js b/Gruntfile.js
index 55235b03..ea72fe39 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -188,6 +188,16 @@ module.exports = function(grunt) {
         // This generated JS binary is currently not used and even excluded from source control using .gitignore.
         dest: 'build/closure/closure_compiled_binary.js'
       }
+    },
+    nodewebkit: {
+      options: {
+        build_dir: './dest/desktop/', // destination folder of releases.
+        mac: true,
+        win: true,
+        linux32: true,
+        linux64: true
+      },
+      src: ['./dest/**/*', "./package.json", "!./dest/desktop/"]
     }
   });
 
@@ -214,6 +224,8 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-ghost');
   grunt.loadNpmTasks('grunt-open');
   grunt.loadNpmTasks('grunt-leading-indent');
+  grunt.loadNpmTasks('grunt-node-webkit-builder');
+  grunt.loadNpmTasks('grunt-contrib-copy');
 
   // Validate
   grunt.registerTask('lint', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint']);
@@ -232,7 +244,9 @@ module.exports = function(grunt) {
   // Validate & Build
   grunt.registerTask('default', ['clean:before', 'lint', 'compile', 'merge']);
 
-  // Start webserver
+  // Build stand alone app with nodewebkit
+  grunt.registerTask('desktop', ['default', 'nodewebkit']);
+
   grunt.registerTask('server', ['merge', 'express:regular', 'open:regular', 'express-keepalive']);
 
   // Start webserver and watch for changes
diff --git a/build/closure/closure_compiler_20130823.jar b/build/closure/closure_compiler_20130823.jar
old mode 100644
new mode 100755
diff --git a/build/closure/piskel-closure-externs.js b/build/closure/piskel-closure-externs.js
old mode 100644
new mode 100755
diff --git a/package.json b/package.json
index 99855747..96768189 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "author": "Julian Descottes, Vincent Renaudin",
   "name": "piskel",
+  "main": "./dest/index.html",
   "description": "Web based 2d animations editor",
   "version": "0.0.1",
   "homepage": "http://github.com/juliandescottes/piskel",
@@ -9,7 +10,8 @@
     "url": "http://github.com/juliandescottes/piskel.git"
   },
   "scripts": {
-    "test": "grunt test"
+    "test": "grunt test",
+    "start": "nodewebkit"
   },
   "devDependencies": {
     "grunt": "~0.4.1",
@@ -24,6 +26,11 @@
     "grunt-ghost": "1.0.12",
     "grunt-open": "0.2.3",
     "grunt-leading-indent": "0.1.0",
-    "grunt-closure-tools": "~0.8.3"
+    "grunt-closure-tools": "~0.8.3",
+    "grunt-node-webkit-builder": "0.1.19",
+    "nodewebkit": "0.8.4"
+  },
+  "window": {
+    "toolbar": false
   }
 }
diff --git a/src/js/controller/piskel/PublicPiskelController.js b/src/js/controller/piskel/PublicPiskelController.js
index d9e5002b..a982968c 100644
--- a/src/js/controller/piskel/PublicPiskelController.js
+++ b/src/js/controller/piskel/PublicPiskelController.js
@@ -44,7 +44,7 @@
   };
 
   ns.PublicPiskelController.prototype.duplicateCurrentFrame = function () {
-    this.piskelController.duplicateFrameAt(this.getCurrentFrameIndex());
+    this.duplicateFrameAt(this.getCurrentFrameIndex());
   };
 
   ns.PublicPiskelController.prototype.raiseSaveStateEvent_ = function (fn, args) {