diff --git a/.gitignore b/.gitignore
index 49265d7..c698ad6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ build/cve*
 build/vulnerabilities*
 *.bak
 Vagrant/Vagrantfile
+Vagrant/data
+Vagrant/.vagrant
diff --git a/Vagrant/Vagrantfile b/Vagrant/Vagrantfile
index 2f59cf7..99ac1aa 100644
--- a/Vagrant/Vagrantfile
+++ b/Vagrant/Vagrantfile
@@ -12,13 +12,13 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "fc23-mariadb10-0"
-  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-23-20151030.x86_64.vagrant-virtualbox.box"
+
+  config.vm.box = "centos/7"
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
   # `vagrant box outdated`. This is not recommended.
   # config.vm.box_check_update = false
-  config.vbguest.auto_update = true
+  #config.vbguest.auto_update = true
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
@@ -36,12 +36,13 @@ Vagrant.configure(2) do |config|
   # Bridged networks make the machine appear as another physical device on
   # your network.
   config.vm.network "public_network"
-  config.vm.hostname = 'dev.app'
-  config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local)
+  config.vm.hostname = 'mysql57'
+  config.hostmanager.aliases = %w(mysql57.localdomain mysql57.local)
   # Share an additional folder to the guest VM. The first argument is
   # the path on the host to the actual folder. The second argument is
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
+  # config.vm.synced_folder '.', '/vagrant', disabled: true
   config.vm.synced_folder "./data", "/data"
 
   # Provider-specific configuration so you can fine-tune various
@@ -49,11 +50,9 @@ Vagrant.configure(2) do |config|
   # Example for VirtualBox:
   #
   config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = false
-  #
-  #   # Customize the amount of memory on the VM:
-     vb.memory = "1024"
+      vb.name = "mysql57"
+  	  vb.memory = "2048"
+  	  vb.cpus = 2
   end
   #
   # View the documentation for the provider you are using for more
@@ -79,21 +78,28 @@ Vagrant.configure(2) do |config|
      if [ ! -d "/data/MySQLTuner-perl" ]; then
       cd /data
       sudo git clone https://github.com/major/MySQLTuner-perl.git
-      fi
-      sudo yum -y install perl-WWW-Mechanize-GZip  perl-App-cpanminus perl-List-MoreUtils
-      sudo cpanm install File::Util
+     fi
+     
+     sudo rpm -ivh https://dev.mysql.com/get/mysql57-community-release-fc23-7.noarch.rpm
+     sudo yum -y install perl-WWW-Mechanize-GZip  perl-App-cpanminus perl-List-MoreUtils
+     sudo cpanm install File::Util
 
-     sudo yum -y install mariadb mariadb-server wget
-     sudo systemctl start mariadb.service
-     mysql -e 'select version();'
+     sudo yum -y install  mysql-community-server mysql-community-client  wget
+     sudo systemctl start mysqld.service
+     PASSWORD=$(sudo grep -i "temporary password" /var/log/mysqld.log | cut -d':' -f4 | xargs -n 1 echo)
+     echo "PASSWORD: $PASSWORD"
+     mysql -uroot -p$PASSWORD --connect-expired-password -e "ALTER USER 'root'@'localhost'  IDENTIFIED BY 'MySqlSecr3t#'"
+     mysql -uroot -psecret -e 'select version();'
      cd /data
-     sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
+     [ -f "employees_db-full-1.0.6.tar.bz2" ] || sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
      sudo tar xvjf employees_db-full-1.0.6.tar.bz2
      cd employees_db
-     cat employees.sql | mysql
+     cat employees.sql | mysql -uroot -pMySqlSecr3t#
+
      cd ..
      cd MySQLTuner-perl
-     perl mysqltuner.pl --idxstat --dbstat
+
+     perl mysqltuner.pl --user root --pass MySqlSecr3t# --idxstat --dbstat
   SHELL
    config.vm.provision :hostmanager
 end
diff --git a/Vagrant/Vagrantfile_for_MariaDB10.0 b/Vagrant/Vagrantfile_for_MariaDB10-0
similarity index 91%
rename from Vagrant/Vagrantfile_for_MariaDB10.0
rename to Vagrant/Vagrantfile_for_MariaDB10-0
index b70492c..9794a92 100644
--- a/Vagrant/Vagrantfile_for_MariaDB10.0
+++ b/Vagrant/Vagrantfile_for_MariaDB10-0
@@ -1,114 +1,114 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "centos/7"
-  # config.vm.box_check_update = false
-  config.vbguest.auto_update = true
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  if Vagrant.has_plugin?("vagrant-proxyconf")
-    config.proxy.http     = "http://10.195.50.51:3128/"
-    config.proxy.https    = "http://10.195.50.51:3128/"
-    config.proxy.no_proxy = "localhost,127.0.0.1,.example.com"
-  end
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.0.115"
-  config.hostmanager.enabled = true
-  config.hostmanager.manage_host = true
-  config.hostmanager.ignore_private_ip = false
-  config.hostmanager.include_offline = true
-  
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  config.vm.network "public_network"
-  config.vm.hostname = 'dev.app'
-  config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local)
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  config.vm.synced_folder "./data", "/data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = false
-  #
-  #   # Customize the amount of memory on the VM:
-     vb.memory = "1024"
-  end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell", inline: <<-SHELL
-     sudo yum -y update
-     echo "secret" | sudo passwd --stdin root
-     sudo cp -pr ~vagrant/.ssh /root
-     sudo chown -R root.root  /root/.ssh
-
-    sudo yum-config-manager --enable base
-
-echo "[mariadb]" >/tmp/mariadb.repo
-echo "name = MariaDB" >>/tmp/mariadb.repo
-echo "baseurl = http://yum.mariadb.org/10.0/centos7-amd64" >> /tmp/mariadb.repo
-echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB" >> /tmp/mariadb.repo
-echo "gpgcheck=1" >> /tmp/mariadb.repo
-sudo cp /tmp/mariadb.repo /etc/yum.repos.d/
-
-     sudo rpm -Uvh http://mirrors.ircam.fr/pub/fedora/epel/7/x86_64/e/epel-release-7-10.noarch.rpm
-
-
-     sudo yum -y install python2-pip git python perl-WWW-Mechanize-GZip perl-App-cpanminus perl-List-MoreUtils MariaDB-server MariaDB-Client wget
- 
-     sudo pip install --upgrade pip
-     if [ ! -d "/data/MySQLTuner-perl" ]; then
-      cd /data
-      sudo git clone https://github.com/major/MySQLTuner-perl.git
-     fi
-     sudo cpanm install File::Util
-
-     #sudo systemctl start mariadb.service
-     sudo service mysql start
-     mysql -e 'select version();'
-     cd /data
-     sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
-     sudo tar xvjf employees_db-full-1.0.6.tar.bz2
-     cd employees_db
-     cat employees.sql | mysql
-     cd ..
-     cd MySQLTuner-perl
-     perl mysqltuner.pl --idxstat --dbstat
-  SHELL
-   config.vm.provision :hostmanager
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "centos/7"
+  # config.vm.box_check_update = false
+  # config.vbguest.auto_update = true
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  if Vagrant.has_plugin?("vagrant-proxyconfx")
+    config.proxy.http     = "http://10.195.50.51:3128/"
+    config.proxy.https    = "http://10.195.50.51:3128/"
+    config.proxy.no_proxy = "localhost,127.0.0.1,.example.com"
+  end
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.0.100"
+  config.hostmanager.enabled = true
+  config.hostmanager.manage_host = true
+  config.hostmanager.ignore_private_ip = false
+  config.hostmanager.include_offline = true
+  
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  config.vm.network "public_network"
+  config.vm.hostname = 'maria100'
+  config.hostmanager.aliases = %w(maria100.localdomain maria100.local)
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  config.vm.synced_folder "./data", "/data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = false
+  #
+  #   # Customize the amount of memory on the VM:
+     vb.memory = "1024"
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "shell", inline: <<-SHELL
+     sudo yum -y update
+     echo "secret" | sudo passwd --stdin root
+     sudo cp -pr ~vagrant/.ssh /root
+     sudo chown -R root.root  /root/.ssh
+
+    sudo yum-config-manager --enable base
+
+echo "[mariadb]" >/tmp/mariadb.repo
+echo "name = MariaDB" >>/tmp/mariadb.repo
+echo "baseurl = http://yum.mariadb.org/10.0/centos7-amd64" >> /tmp/mariadb.repo
+echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB" >> /tmp/mariadb.repo
+echo "gpgcheck=1" >> /tmp/mariadb.repo
+sudo cp /tmp/mariadb.repo /etc/yum.repos.d/
+
+     sudo rpm -Uvh http://mirrors.ircam.fr/pub/fedora/epel/7/x86_64/e/epel-release-latest.noarch.rpm
+
+
+     sudo yum -y install python2-pip git python perl-WWW-Mechanize-GZip perl-App-cpanminus perl-List-MoreUtils MariaDB-server MariaDB-Client wget
+ 
+     sudo pip install --upgrade pip
+     if [ ! -d "/data/MySQLTuner-perl" ]; then
+      cd /data
+      sudo git clone https://github.com/major/MySQLTuner-perl.git
+     fi
+     sudo cpanm install File::Util
+
+     #sudo systemctl start mariadb.service
+     sudo service mysql start
+     mysql -e 'select version();'
+     cd /data
+     sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
+     sudo tar xvjf employees_db-full-1.0.6.tar.bz2
+     cd employees_db
+     cat employees.sql | mysql
+     cd ..
+     cd MySQLTuner-perl
+     perl mysqltuner.pl --idxstat --dbstat
+  SHELL
+   config.vm.provision :hostmanager
+end
diff --git a/Vagrant/Vagrantfile_for_MariaDB10.1 b/Vagrant/Vagrantfile_for_MariaDB10-1
similarity index 100%
rename from Vagrant/Vagrantfile_for_MariaDB10.1
rename to Vagrant/Vagrantfile_for_MariaDB10-1
diff --git a/Vagrant/Vagrantfile_for_MariaDB10.2 b/Vagrant/Vagrantfile_for_MariaDB10-2
similarity index 97%
rename from Vagrant/Vagrantfile_for_MariaDB10.2
rename to Vagrant/Vagrantfile_for_MariaDB10-2
index 650866f..5739af0 100644
--- a/Vagrant/Vagrantfile_for_MariaDB10.2
+++ b/Vagrant/Vagrantfile_for_MariaDB10-2
@@ -1,107 +1,107 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "fc23-mariadb10-1"
-  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-23-20151030.x86_64.vagrant-virtualbox.box"
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-  config.vbguest.auto_update = true
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.0.115"
-  config.hostmanager.enabled = true
-  config.hostmanager.manage_host = true
-  config.hostmanager.ignore_private_ip = false
-  config.hostmanager.include_offline = true
-  
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  config.vm.network "public_network"
-  config.vm.hostname = 'dev.app'
-  config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local)
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  config.vm.synced_folder "./data", "/data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = false
-  #
-  #   # Customize the amount of memory on the VM:
-     vb.memory = "1024"
-  end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell", inline: <<-SHELL
-     sudo yum -y update
-     echo "secret" | sudo passwd --stdin root
-     sudo cp -pr ~vagrant/.ssh /root
-     sudo chown -R root.root  /root/.ssh
-     sudo yum -y install git python
-     sudo pip install --upgrade pip
-     if [ ! -d "/data/MySQLTuner-perl" ]; then
-      cd /data
-      sudo git clone https://github.com/major/MySQLTuner-perl.git
-     fi
-     
-     echo "# MariaDB 10.1 Fedora repository list - created 2016-01-25 13:11 UTC
-# http://mariadb.org/mariadb/repositories/
-[mariadb]
-name = MariaDB
-baseurl = http://yum.mariadb.org/10.2/fedora23-amd64
-gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
-gpgcheck=1" >> /etc/yum.repos.d/mariadb.repo
-     sudo yum -y install perl-WWW-Mechanize-GZip  perl-App-cpanminus perl-List-MoreUtils
-     sudo cpanm install File::Util
-
-     sudo yum -y install  MariaDB-server MariaDB-client wget
-     sudo systemctl start mariadb.service
-     mysql -e 'select version();'
-     cd /data
-     sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
-     sudo tar xvjf employees_db-full-1.0.6.tar.bz2
-     cd employees_db
-     cat employees.sql | mysql
-     cd ..
-     cd MySQLTuner-perl
-     perl mysqltuner.pl --idxstat --dbstat
-  SHELL
-   config.vm.provision :hostmanager
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "fc23-mariadb10-1"
+  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-23-20151030.x86_64.vagrant-virtualbox.box"
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+  config.vbguest.auto_update = true
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.0.115"
+  config.hostmanager.enabled = true
+  config.hostmanager.manage_host = true
+  config.hostmanager.ignore_private_ip = false
+  config.hostmanager.include_offline = true
+  
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  config.vm.network "public_network"
+  config.vm.hostname = 'dev.app'
+  config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local)
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  config.vm.synced_folder "./data", "/data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = false
+  #
+  #   # Customize the amount of memory on the VM:
+     vb.memory = "1024"
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "shell", inline: <<-SHELL
+     sudo yum -y update
+     echo "secret" | sudo passwd --stdin root
+     sudo cp -pr ~vagrant/.ssh /root
+     sudo chown -R root.root  /root/.ssh
+     sudo yum -y install git python
+     sudo pip install --upgrade pip
+     if [ ! -d "/data/MySQLTuner-perl" ]; then
+      cd /data
+      sudo git clone https://github.com/major/MySQLTuner-perl.git
+     fi
+     
+     echo "# MariaDB 10.1 Fedora repository list - created 2016-01-25 13:11 UTC
+# http://mariadb.org/mariadb/repositories/
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/10.2/fedora23-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1" >> /etc/yum.repos.d/mariadb.repo
+     sudo yum -y install perl-WWW-Mechanize-GZip  perl-App-cpanminus perl-List-MoreUtils
+     sudo cpanm install File::Util
+
+     sudo yum -y install  MariaDB-server MariaDB-client wget
+     sudo systemctl start mariadb.service
+     mysql -e 'select version();'
+     cd /data
+     sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
+     sudo tar xvjf employees_db-full-1.0.6.tar.bz2
+     cd employees_db
+     cat employees.sql | mysql
+     cd ..
+     cd MySQLTuner-perl
+     perl mysqltuner.pl --idxstat --dbstat
+  SHELL
+   config.vm.provision :hostmanager
+end
diff --git a/Vagrant/Vagrantfile_for_MariaDB10.3 b/Vagrant/Vagrantfile_for_MariaDB10-3
similarity index 97%
rename from Vagrant/Vagrantfile_for_MariaDB10.3
rename to Vagrant/Vagrantfile_for_MariaDB10-3
index 0dfac2c..a754112 100644
--- a/Vagrant/Vagrantfile_for_MariaDB10.3
+++ b/Vagrant/Vagrantfile_for_MariaDB10-3
@@ -1,106 +1,106 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-	config.vm.box = "centos/7"
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-  config.vbguest.auto_update = true
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.0.115"
-  config.hostmanager.enabled = true
-  config.hostmanager.manage_host = true
-  config.hostmanager.ignore_private_ip = false
-  config.hostmanager.include_offline = true
-  
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  config.vm.network "public_network"
-  config.vm.hostname = 'dev.app'
-  config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local)
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  config.vm.synced_folder "./data", "/data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = false
-  #
-  #   # Customize the amount of memory on the VM:
-     vb.memory = "1024"
-  end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell", inline: <<-SHELL
-     sudo yum -y update
-     echo "secret" | sudo passwd --stdin root
-     sudo cp -pr ~vagrant/.ssh /root
-     sudo chown -R root.root  /root/.ssh
-     sudo yum -y install git python
-     sudo pip install --upgrade pip
-     if [ ! -d "/data/MySQLTuner-perl" ]; then
-      cd /data
-      sudo git clone https://github.com/major/MySQLTuner-perl.git
-     fi
-     
-     echo "# MariaDB 10.1 Fedora repository list - created 2016-01-25 13:11 UTC
-# http://mariadb.org/mariadb/repositories/
-[mariadb]
-name = MariaDB
-baseurl = http://yum.mariadb.org/10.3/fedora23-amd64
-gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
-gpgcheck=1" >> /etc/yum.repos.d/mariadb.repo
-     sudo yum -y install perl-WWW-Mechanize-GZip  perl-App-cpanminus perl-List-MoreUtils
-     sudo cpanm install File::Util
-
-     sudo yum -y install  MariaDB-server MariaDB-client wget
-     sudo systemctl start mariadb.service
-     mysql -e 'select version();'
-     cd /data
-     sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
-     sudo tar xvjf employees_db-full-1.0.6.tar.bz2
-     cd employees_db
-     cat employees.sql | mysql
-     cd ..
-     cd MySQLTuner-perl
-     perl mysqltuner.pl --idxstat --dbstat
-  SHELL
-   config.vm.provision :hostmanager
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+	config.vm.box = "centos/7"
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+  config.vbguest.auto_update = true
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.0.115"
+  config.hostmanager.enabled = true
+  config.hostmanager.manage_host = true
+  config.hostmanager.ignore_private_ip = false
+  config.hostmanager.include_offline = true
+  
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  config.vm.network "public_network"
+  config.vm.hostname = 'dev.app'
+  config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local)
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  config.vm.synced_folder "./data", "/data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = false
+  #
+  #   # Customize the amount of memory on the VM:
+     vb.memory = "1024"
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "shell", inline: <<-SHELL
+     sudo yum -y update
+     echo "secret" | sudo passwd --stdin root
+     sudo cp -pr ~vagrant/.ssh /root
+     sudo chown -R root.root  /root/.ssh
+     sudo yum -y install git python
+     sudo pip install --upgrade pip
+     if [ ! -d "/data/MySQLTuner-perl" ]; then
+      cd /data
+      sudo git clone https://github.com/major/MySQLTuner-perl.git
+     fi
+     
+     echo "# MariaDB 10.1 Fedora repository list - created 2016-01-25 13:11 UTC
+# http://mariadb.org/mariadb/repositories/
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/10.3/fedora23-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1" >> /etc/yum.repos.d/mariadb.repo
+     sudo yum -y install perl-WWW-Mechanize-GZip  perl-App-cpanminus perl-List-MoreUtils
+     sudo cpanm install File::Util
+
+     sudo yum -y install  MariaDB-server MariaDB-client wget
+     sudo systemctl start mariadb.service
+     mysql -e 'select version();'
+     cd /data
+     sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
+     sudo tar xvjf employees_db-full-1.0.6.tar.bz2
+     cd employees_db
+     cat employees.sql | mysql
+     cd ..
+     cd MySQLTuner-perl
+     perl mysqltuner.pl --idxstat --dbstat
+  SHELL
+   config.vm.provision :hostmanager
+end
diff --git a/Vagrant/Vagrantfile_for_MariaDB10-4 b/Vagrant/Vagrantfile_for_MariaDB10-4
new file mode 100644
index 0000000..53b36fc
--- /dev/null
+++ b/Vagrant/Vagrantfile_for_MariaDB10-4
@@ -0,0 +1,109 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+	config.vm.box = "centos/7"
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+  config.vbguest.auto_update = true
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.0.115"
+  config.hostmanager.enabled = true
+  config.hostmanager.manage_host = true
+  config.hostmanager.ignore_private_ip = false
+  config.hostmanager.include_offline = true
+  
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  config.vm.network "public_network"
+  config.vm.hostname = 'maria104'
+  config.hostmanager.aliases = %w(maria104.localdomain maria104.local)
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder '.', '/vagrant', disabled: true
+  config.vm.synced_folder "./data", "/data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = false
+  #
+  #   # Customize the amount of memory on the VM:
+      vb.name = "maria104"
+  vb.memory = "2048"
+  vb.cpus = 2
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "shell", inline: <<-SHELL
+     sudo yum -y update
+     echo "secret" | sudo passwd --stdin root
+     sudo cp -pr ~vagrant/.ssh /root
+     sudo chown -R root.root  /root/.ssh
+     sudo yum -y install git python
+     sudo pip install --upgrade pip
+     if [ ! -d "/data/MySQLTuner-perl" ]; then
+      cd /data
+      sudo git clone https://github.com/major/MySQLTuner-perl.git
+     fi
+     
+     echo "# MariaDB 10.1 Fedora repository list - created 2016-01-25 13:11 UTC
+# http://mariadb.org/mariadb/repositories/
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/10.4/rhel7-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1" >> /etc/yum.repos.d/mariadb.repo
+     sudo yum -y install perl-WWW-Mechanize-GZip  perl-App-cpanminus perl-List-MoreUtils
+     sudo cpanm install File::Util
+
+     sudo yum -y install  MariaDB-server MariaDB-client wget
+     sudo systemctl start mariadb.service
+     mysql -e 'select version();'
+     cd /data
+     sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2"
+     sudo tar xvjf employees_db-full-1.0.6.tar.bz2
+     cd employees_db
+     cat employees.sql | mysql
+     cd ..
+     cd MySQLTuner-perl
+     perl mysqltuner.pl --idxstat --dbstat
+  SHELL
+   config.vm.provision :hostmanager
+end
diff --git a/Vagrant/Vagrantfile_for_MySQL5-7 b/Vagrant/Vagrantfile_for_MySQL5-7
index 460a4dd..04436c0 100644
--- a/Vagrant/Vagrantfile_for_MySQL5-7
+++ b/Vagrant/Vagrantfile_for_MySQL5-7
@@ -12,13 +12,13 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "fc23-mysql5-7"
-  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-23-20151030.x86_64.vagrant-virtualbox.box"
+
+  config.vm.box = "centos/7"
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
   # `vagrant box outdated`. This is not recommended.
   # config.vm.box_check_update = false
-  config.vbguest.auto_update = true
+  #config.vbguest.auto_update = true
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
@@ -36,12 +36,13 @@ Vagrant.configure(2) do |config|
   # Bridged networks make the machine appear as another physical device on
   # your network.
   config.vm.network "public_network"
-  config.vm.hostname = 'dev.app'
-  config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local)
+  config.vm.hostname = 'mysql57'
+  config.hostmanager.aliases = %w(mysql57.localdomain mysql57.local)
   # Share an additional folder to the guest VM. The first argument is
   # the path on the host to the actual folder. The second argument is
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
+  # config.vm.synced_folder '.', '/vagrant', disabled: true
   config.vm.synced_folder "./data", "/data"
 
   # Provider-specific configuration so you can fine-tune various
@@ -49,11 +50,9 @@ Vagrant.configure(2) do |config|
   # Example for VirtualBox:
   #
   config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = false
-  #
-  #   # Customize the amount of memory on the VM:
-     vb.memory = "1024"
+      vb.name = "mysql57"
+      vb.memory = "2048"
+      vb.cpus = 2
   end
   #
   # View the documentation for the provider you are using for more
@@ -100,7 +99,7 @@ Vagrant.configure(2) do |config|
      cd ..
      cd MySQLTuner-perl
 
-     #perl mysqltuner.pl --user root --pass MySqlSecr3t# --idxstat --dbstat
+     perl mysqltuner.pl --user root --pass MySqlSecr3t# --idxstat --dbstat
   SHELL
    config.vm.provision :hostmanager
 end
diff --git a/Vagrant/prepare.sh b/Vagrant/prepare.sh
index 1c44623..e1c5790 100644
--- a/Vagrant/prepare.sh
+++ b/Vagrant/prepare.sh
@@ -1,8 +1,9 @@
-#!/bin/sh
-rm -f Vagrantfile
-cp Vagrantfile_for_MariaDB10.0 Vagrantfile
-mkdir data
-vagrant plugin install vagrant-hostmanager
-vagrant plugin install vagrant-vbguest
-vagrant plugin install vagrant-proxyconf
-vagrant --provision up
+#!/bin/sh
+VERSION=${1:-"10.4"}
+rm -f Vagrantfile
+cp Vagrantfile_for_MariaDB${VERSION} Vagrantfile
+mkdir data
+vagrant plugin install vagrant-hostmanager
+vagrant plugin install vagrant-vbguest
+vagrant plugin install vagrant-proxyconf
+vagrant --provision up