2 files changed, 7 insertions, 5 deletions

diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 960bdef9..201598fc 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -82,7 +82,7 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
     //
     copyLibToCloud: {
         enumerable: false,
-        value: function (path, libName) {
+        value: function (path, libName, callback) {
                 //
                 if(this.coreApi.directoryExists({uri: path+libName}).status === 404) {
                         this.chromeApi.directoryContents(this.chromeApi.fileSystem.root, function (contents) {
@@ -91,7 +91,7 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                                                 //Getting contents of library to be copied
                                                 this.chromeApi.directoryContents(contents[i], function (lib) {
                                                         //Creating directory structure from subfolders
-                                                        this.copyDirectoryToCloud(path, contents[i], path, function (status) {console.log(status)});
+                                                        this.copyDirectoryToCloud(path, contents[i], path, callback);
                                                 }.bind(this));
                                                 break;
                                         }
@@ -116,7 +116,7 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                                 dir = folder.name;
                             }
                             //
-                            if (!this.coreApi.createDirectory({uri: dir})) {
+                            if (!this.coreApi.createDirectory({uri: dir.replace(/\/\//gi, '/')})) {
                                 //Error occured while creating folders
                                 return;
                             }
@@ -132,12 +132,14 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                                                         this.chromeApi.fileContent(contents[i].fullPath, function (result) {
                                                                 //
                                                                 //this.coreApi.createFile({uri: fileRoot+result.file.fullPath, contents: blob.getBlob(result.data.type), contentType: result.data.type});
-                                                                this.coreApi.createFile({uri: fileRoot+result.file.fullPath, contents: result.content});
+                                                                this.coreApi.createFile({uri: (fileRoot+result.file.fullPath).replace(/\/\//gi, '/'), contents: result.content});
                                                         }.bind(this));
                                                 }
                                         }
                                 }.bind(this));
                         }
+                        //TODO Add logic for proper callback status(es)
+                        if (callback) callback(true);
         }
     },
         ////////////////////////////////////////////////////////////////////
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index a61c30d1..00ee7ed2 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.0.1"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.0"}
         ]
 }
\ No newline at end of file