diff --git a/.gitignore b/.gitignore
index e88e0a21..67f6f665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 cache/*
 coverage
+.bundle
 .DS_Store
 .DS_Store?
 *.sublime-*
diff --git a/Gemfile b/Gemfile
index e733c086..0cc315cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem "json"
 gem "terminal-table"
 gem "ruby-progressbar", ">=1.2.0"
 
-group :development, :test do
+group :test do
   gem "webmock", ">=1.9.3"
   gem "simplecov"
   gem "rspec", :require => "spec"
diff --git a/README b/README
index cbf1ee83..b63f8f88 100644
--- a/README
+++ b/README
@@ -49,14 +49,14 @@ ryandewhurst at gmail
     sudo apt-get install libcurl4-gnutls-dev libopenssl-ruby libxml2 libxml2-dev libxslt1-dev ruby-dev
     git clone https://github.com/wpscanteam/wpscan.git
     cd wpscan
-    sudo gem install bundler && bundle install --without test development
+    sudo gem install bundler && bundle install --without test
 
   -> Installing on Fedora:
 
     sudo yum install gcc ruby-devel libxml2 libxml2-devel libxslt libxslt-devel libcurl-devel
     git clone https://github.com/wpscanteam/wpscan.git
     cd wpscan
-    sudo gem install bundler && bundle install --without test development
+    sudo gem install bundler && bundle install --without test
 
   -> Installing on Archlinux:
 
@@ -65,7 +65,7 @@ ryandewhurst at gmail
 
     git clone https://github.com/wpscanteam/wpscan.git
     cd wpscan
-    sudo gem install bundler && bundle install --without test development
+    sudo gem install bundler && bundle install --without test
 
     gem install typhoeus
     gem install nokogiri
@@ -76,7 +76,7 @@ ryandewhurst at gmail
 
     git clone https://github.com/wpscanteam/wpscan.git
     cd wpscan
-    sudo gem install bundler && bundle install --without test development
+    sudo gem install bundler && bundle install --without test
 
 ==KNOWN ISSUES==
 
diff --git a/README.md b/README.md
index f417daca..13641654 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Prerequisites:
 
 ```cd wpscan```
 
-```sudo gem install bundler && bundle install --without test development```
+```sudo gem install bundler && bundle install --without test```
 
 *Installing on Fedora:*
 
@@ -58,7 +58,7 @@ Prerequisites:
 
 ```cd wpscan```
 
-```sudo gem install bundler && bundle install --without test development```
+```sudo gem install bundler && bundle install --without test```
 
 *Installing on Archlinux:*
 
@@ -70,7 +70,7 @@ Prerequisites:
 
 ```cd wpscan```
 
-```sudo gem install bundler && bundle install --without test development```
+```sudo gem install bundler && bundle install --without test```
 
 ```gem install typhoeus```
 
@@ -84,7 +84,7 @@ Apple Xcode, Command Line Tools and the libffi are needed (to be able to install
 
 ```cd wpscan```
 
-```sudo gem install bundler && bundle install --without test development```
+```sudo gem install bundler && bundle install --without test```
 
 #### KNOWN ISSUES
 
diff --git a/lib/common/common_helper.rb b/lib/common/common_helper.rb
index cd94d7bb..b8e382a8 100644
--- a/lib/common/common_helper.rb
+++ b/lib/common/common_helper.rb
@@ -39,10 +39,6 @@ $LOAD_PATH.unshift(LIB_DIR)
 $LOAD_PATH.unshift(WPSCAN_LIB_DIR)
 $LOAD_PATH.unshift(MODELS_LIB_DIR)
 
-def kali_linux?
-  %x{uname -a}.match(/linux kali/i) ? true : false
-end
-
 require 'environment'
 
 # TODO : add an exclude pattern ?
diff --git a/lib/environment.rb b/lib/environment.rb
index 479bbfd7..75362c8f 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -13,7 +13,7 @@ Encoding.default_external = Encoding::UTF_8
 
 begin
   # Standard libs
-  require 'bundler/setup' unless kali_linux?
+  require 'bundler/setup'
   require 'getoptlong'
   require 'optparse' # Will replace getoptlong
   require 'uri'