diff --git a/lib/index.js b/lib/index.js
index 38ec0b3..518502a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -135,10 +135,6 @@ class App
             {
                 config.name = args._[0]
             }
-            else
-            {
-                config.name = 'No name'
-            }
         }
 
         if(config.host === '')
diff --git a/lib/watcher.js b/lib/watcher.js
index c545f71..976d0c0 100644
--- a/lib/watcher.js
+++ b/lib/watcher.js
@@ -36,7 +36,15 @@ class Watcher
         // Connect event
         this.socket.on('connect', () =>
         {
-            this.socket.emit('start_project', { name: this.config.name, path: this.path, excludeRegex: '' + this.excludeRegex })
+            let name = this.config.name
+
+            // If no name, use folder name
+            if(!name)
+            {
+                name = path.parse(this.path).name
+            }
+
+            this.socket.emit('start_project', { name, path: this.path, excludeRegex: '' + this.excludeRegex })
 
             // Debug
             if(this.config.debug)
diff --git a/readme.md b/readme.md
index 1d98a0b..601d216 100644
--- a/readme.md
+++ b/readme.md
@@ -71,7 +71,7 @@ Arguments list
 |---|---|
 |parameter|`--name`|
 |shortcut|`-n`|
-|default value|*(string)*`No name`|
+|default value|*(string)* folder name|
 |description|Project name<br>(you can simply add a string after `keppler` keyword like `keppler "My project"`)|
 
 |||