diff --git a/Gemfile.lock b/Gemfile.lock
index 75f19e0..c4843c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     net-http-persistent (2.9.4)
     nio4r (2.5.8)
-    puma (5.6.4)
+    puma (5.6.5)
       nio4r (~> 2.0)
     rack (2.2.3.1)
     rack-mini-profiler (2.3.3)
diff --git a/README.md b/README.md
index 25b82f5..d6009e1 100644
--- a/README.md
+++ b/README.md
@@ -23,11 +23,7 @@ bundle exec rake gems:update
 bundle exec rake server:start
 ```
 
-This will start a daemonized process, you can stop the server with:
-
-```sh
-bundle exec rake server:stop
-```
+You can access application page at http://localhost:8080/ now. 
 
 ### Running With Docker
 
diff --git a/Rakefile b/Rakefile
index 79705ff..bf9c582 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,11 +21,6 @@ namespace :server do
   task :restart => 'cache:clean_index' do
     sh "kill -USR1 `cat tmp/pids/server.pid`"
   end
-
-  desc 'Shut down the server'
-  task :stop do
-    sh "kill -9 `cat tmp/pids/server.pid`"
-  end
 end
 
 namespace :gems do
diff --git a/scripts/puma.rb b/scripts/puma.rb
index f0be36c..bd51648 100644
--- a/scripts/puma.rb
+++ b/scripts/puma.rb
@@ -6,7 +6,6 @@
 rackup root + 'config.ru'
 environment 'production'
 bind 'tcp://0.0.0.0:8080'
-daemonize unless ENV['DOCKERIZED']
 pidfile root + 'tmp/pids/server.pid'
 unless ENV['DOCKERIZED']
   stdout_redirect root + 'log/puma.log', root + 'log/puma.err.log', true