diff --git a/Config/config.xml b/Config/config.xml
index 772ba0a..7165f35 100755
--- a/Config/config.xml
+++ b/Config/config.xml
@@ -61,6 +61,9 @@
     </services>
 
     <hooks>
+        <hook id="dealer.configuration.hook" class="Dealer\Hook\HookManager" scope="request">
+            <tag name="hook.event_listener" event="module.configuration" type="back" method="onModuleConfigure" />
+        </hook>
         <hook id="dealer.admin.hook" class="Dealer\Hook\AdminInterfaceHook" scope="request">
             <tag name="hook.event_listener" event="main.top-menu-modules" type="back" method="onTopMenuTools"/>
             <argument type="service" id="router.dealer"/>
@@ -74,6 +77,7 @@
             <tag name="hook.event_listener" event="dealer.edit.js" type="back" method="insertFolderJs"/>
             <tag name="hook.event_listener" event="dealer.edit.js" type="back" method="insertBrandJs"/>
             <tag name="hook.event_listener" event="dealer.edit.js" type="back" method="insertProductJs"/>
+            <tag name="hook.event_listener" event="dealer.edit.js" type="back" method="insertGoogleMapsApiJs"/>
         </hook>
         <hook id="dealer.thelia.admin.hook" class="Dealer\Hook\TheliaAdminHook" scope="request">
             <tag name="hook.event_listener" event="content.tab-content" type="back" method="onContentModuleTab"/>
@@ -89,6 +93,7 @@
     </hooks>
 
     <forms>
+        <form name="dealer.configuration.form" class="Dealer\Form\Configuration" />
         <form name="dealer.create" class="Dealer\Form\DealerForm"/>
         <form name="dealer.update" class="Dealer\Form\DealerUpdateForm"/>
         <form name="dealer-contact.create" class="Dealer\Form\ContactForm"/>
diff --git a/Config/module.xml b/Config/module.xml
index 20332d8..a024f0f 100755
--- a/Config/module.xml
+++ b/Config/module.xml
@@ -16,7 +16,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.4.4</version>
+    <version>2.4.5</version>
     <author>
         <name>Penalver Antony</name>
         <email>apenalver@openstudio.fr</email>
diff --git a/Config/routing.xml b/Config/routing.xml
index 9ce5775..8ed4205 100755
--- a/Config/routing.xml
+++ b/Config/routing.xml
@@ -23,6 +23,11 @@
         <requirement key="id">\d+</requirement>
     </route>
 
+    <!-- Configuration -->
+    <route id="dealer.config" path="/admin/module/Dealer/configure" methods="post">
+        <default key="_controller">Dealer:Configure:configure</default>
+    </route>
+
     <!-- Contact -->
     <route id="dealer.dealer.contact.create" path="/admin/module/Dealer/contact" methods="post">
         <default key="_controller">Dealer:Contact:create</default>
diff --git a/Controller/ConfigureController.php b/Controller/ConfigureController.php
new file mode 100644
index 0000000..728ea2c
--- /dev/null
+++ b/Controller/ConfigureController.php
@@ -0,0 +1,81 @@
+<?php
+/*************************************************************************************/
+/*      This file is part of the Thelia package.                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : dev@thelia.net                                                       */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      For the full copyright and license information, please view the LICENSE.txt  */
+/*      file that was distributed with this source code.                             */
+/*************************************************************************************/
+
+namespace Dealer\Controller;
+
+use Dealer\Dealer;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpFoundation\Response;
+use Thelia\Controller\Admin\BaseAdminController;
+use Thelia\Core\Security\AccessManager;
+use Thelia\Core\Security\Resource\AdminResources;
+use Thelia\Core\Thelia;
+use Thelia\Form\Exception\FormValidationException;
+use Thelia\Tools\URL;
+use Thelia\Tools\Version\Version;
+
+/**
+ * Class ConfigureController
+ * @package DealerGoogleTimeZone\Controller
+ */
+class ConfigureController extends BaseAdminController
+{
+
+    public function configureAction()
+    {
+        if (null !== $response = $this->checkAuth(AdminResources::MODULE, 'dealer', AccessManager::UPDATE)) {
+            return $response;
+        }
+
+        $configurationForm = $this->createForm('dealer.configuration.form');
+        $message = null;
+
+        try {
+            $form = $this->validateForm($configurationForm);
+
+            // Get the form field values
+            $data = $form->getData();
+
+            Dealer::setConfigValue('googlemapsapi_key',$data['googlemapsapi_key']);
+
+
+            // Redirect to the success URL,
+            if ($this->getRequest()->get('save_mode') == 'stay') {
+                // If we have to stay on the same page, redisplay the configuration page/
+                $url = '/admin/module/Dealer';
+            } else {
+                // If we have to close the page, go back to the module back-office page.
+                $url = '/admin/modules';
+            }
+
+            return $this->generateRedirect(URL::getInstance()->absoluteUrl($url));
+        } catch (FormValidationException $ex) {
+            $message = $this->createStandardFormValidationErrorMessage($ex);
+        } catch (\Exception $ex) {
+            $message = $ex->getMessage();
+        }
+
+        $this->setupFormErrorContext(
+            $this->getTranslator()->trans("Dealer configuration", [], Dealer::MESSAGE_DOMAIN),
+            $message,
+            $configurationForm,
+            $ex
+        );
+
+        // Before 2.2, the errored form is not stored in session
+        if (Version::test(Thelia::THELIA_VERSION, '2.2', false, "<")) {
+            return $this->render('module-configure', [ 'module_code' => 'Dealer' ]);
+        } else {
+            return $this->generateRedirect(URL::getInstance()->absoluteUrl('/admin/module/Dealer'));
+        }
+    }
+}
diff --git a/Dealer.php b/Dealer.php
index cd9dc75..9396fee 100755
--- a/Dealer.php
+++ b/Dealer.php
@@ -83,6 +83,11 @@ public function update($currentVersion, $newVersion, ConnectionInterface $con =
                 );
             }
         }
+        
+        if (!self::getConfigValue('is_initialized', false)) {
+            self::setConfigValue('googlemapsapi_key', '');
+            self::setConfigValue('is_initialized', true);
+        }
     }
 
     public function getHooks()
diff --git a/Form/Configuration.php b/Form/Configuration.php
new file mode 100644
index 0000000..48c7005
--- /dev/null
+++ b/Form/Configuration.php
@@ -0,0 +1,53 @@
+<?php
+/*************************************************************************************/
+/*      This file is part of the Thelia package.                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : dev@thelia.net                                                       */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      For the full copyright and license information, please view the LICENSE.txt  */
+/*      file that was distributed with this source code.                             */
+/*************************************************************************************/
+
+namespace Dealer\Form;
+
+use Dealer\Dealer;
+use Thelia\Core\Translation\Translator;
+use Thelia\Form\BaseForm;
+use Thelia\Model\ConfigQuery;
+
+/**
+ * Class Configuration
+ * @package DealerGoogleTimeZone\Form
+ */
+class Configuration extends BaseForm {
+
+    protected function buildForm()
+    {
+        $form = $this->formBuilder;
+
+        $form->add(
+            "googlemapsapi_key",
+            "text",
+            array(
+                'data'  => Dealer::getConfigValue("googlemapsapi_key"),
+                'label' => Translator::getInstance()->trans("Google Maps Api Key"),
+                'label_attr' => array(
+                    'for' => "googlemapsapi_key"
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * @return string the name of you form. This name must be unique
+     */
+    public function getName()
+    {
+        return "dealer_configuration";
+    }
+
+
+} 
\ No newline at end of file
diff --git a/Hook/HookManager.php b/Hook/HookManager.php
new file mode 100644
index 0000000..b84d51f
--- /dev/null
+++ b/Hook/HookManager.php
@@ -0,0 +1,29 @@
+<?php
+/*************************************************************************************/
+
+namespace Dealer\Hook;
+
+use Dealer\Dealer;
+use Thelia\Core\Event\Hook\HookRenderEvent;
+use Thelia\Core\Hook\BaseHook;
+use Thelia\Model\ModuleConfig;
+use Thelia\Model\ModuleConfigQuery;
+
+class HookManager extends BaseHook
+{
+
+    public function onModuleConfigure(HookRenderEvent $event)
+    {
+
+        if (null !== $params = ModuleConfigQuery::create()->findByModuleId(Dealer::getModuleId())) {
+            /** @var ModuleConfig $param */
+            foreach ($params as $param) {
+                $vars[ $param->getName() ] = $param->getValue();
+            }
+        }
+
+        $event->add(
+            $this->render('module-configuration.html', $vars)
+        );
+    }
+}
diff --git a/Hook/InternalHook.php b/Hook/InternalHook.php
index e9aff80..ad7e9c2 100644
--- a/Hook/InternalHook.php
+++ b/Hook/InternalHook.php
@@ -8,8 +8,10 @@
 
 namespace Dealer\Hook;
 
+use Dealer\Dealer;
 use Thelia\Core\Event\Hook\HookRenderEvent;
 use Thelia\Core\Hook\BaseHook;
+use Dealer\Model\DealerQuery;
 
 
 /**
@@ -61,4 +63,33 @@ public function insertProductJs(HookRenderEvent $event)
     {
         //$event->add($this->render("script/dealer-product-js.html", $event->getArguments()));
     }
+    
+    public function insertGoogleMapsApiJs(HookRenderEvent $event)
+    {
+        $address = '';
+        if($this->getRequest()->query->has('dealer_id')) {
+            $dearler_id = $this->getRequest()->query->get('dealer_id');
+            if($dearler_id != '') {
+                $dealer = DealerQuery::create()->findOneById($dearler_id);
+                $address = $dealer->getAddress1();
+                if($dealer->getAddress2()) {
+                    $address .= ', ' . $dealer->getAddress2();
+                }
+                if($dealer->getAddress3()) {
+                    $address .= ', ' . $dealer->getAddress3();
+                }
+                $address .= ', ' . $dealer->getCity() . ', ' . $dealer->getZipcode() . ', ' . $dealer->getCountry()->getTitle();
+            }
+        }
+
+        $event->add(
+            $this->render(
+                "script/dealer-geo-js.html",
+                [
+                    'address' => $address,
+                    'googlemapsapi_key' => Dealer::getConfigValue('googlemapsapi_key')
+                ]
+            )
+        );
+    }
 }
\ No newline at end of file
diff --git a/templates/backOffice/default/dealer-edit.html b/templates/backOffice/default/dealer-edit.html
index 26511a4..2b9d611 100755
--- a/templates/backOffice/default/dealer-edit.html
+++ b/templates/backOffice/default/dealer-edit.html
@@ -144,7 +144,6 @@
     {include file="script/dealer-contact-js.html"}
     {include file="script/dealer-contact-info-js.html"}
     {include file="script/dealer-schedules-js.html"}
-    {include file="script/dealer-geo-js.html"}
     {include file="script/dealer-admin-js.html"}
     <script>
         (function ($) {
@@ -164,4 +163,8 @@
         })(jQuery);
     </script>
     {hook name="dealer.edit.js"}
+{/block}
+
+{block name="javascript-last-call"}
+{hook name="wysiwyg.js" location="wysiwyg-document-edit-js" }
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/dealers.html b/templates/backOffice/default/dealers.html
index 1462bad..70903d2 100755
--- a/templates/backOffice/default/dealers.html
+++ b/templates/backOffice/default/dealers.html
@@ -244,4 +244,8 @@
         });
     </script>
     {hook name="dealer.js"}
+{/block}
+
+{block name="javascript-last-call"}
+{hook name="wysiwyg.js" location="wysiwyg-document-edit-js" }
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/form/dealer-create.html b/templates/backOffice/default/form/dealer-create.html
index ef3f086..78c7439 100644
--- a/templates/backOffice/default/form/dealer-create.html
+++ b/templates/backOffice/default/form/dealer-create.html
@@ -105,30 +105,9 @@
         </select>
     </div>
 {/form_field}
-{form_field form=$form field="description"}
-    <div class="form-group">
-        <label class="control-label" for="{$label_attr.for}">
-            {intl l=$label d="dealer.bo.default"}
-            {if $required}<span class="required">*</span>{/if}
-        </label>
 
-        {form_error form=$form field="description"}{$message}{/form_error}
+{render_form_field field="description" extra_class="wysiwyg" value=$DESCRIPTION}
 
-        <textarea class="form-control" name="{$name}" id="{$label_attr.for}"
-                  placeholder="{intl l='The Dealer description' d="dealer.bo.default"}">{$DESCRIPTION}</textarea>
-    </div>
-{/form_field}
-{form_field form=$form field="access"}
-    <div class="form-group">
-        <label class="control-label" for="{$label_attr.for}">
-            {intl l=$label d="dealer.bo.default"}
-            {if $required}<span class="required">*</span>{/if}
-        </label>
+{render_form_field field="access" extra_class="wysiwyg" value=$ACCESS}
 
-        {form_error form=$form field="access"}{$message}{/form_error}
-
-        <textarea class="form-control" name="{$name}" id="{$label_attr.for}"
-                  placeholder="{intl l='The Dealer access' d="dealer.bo.default"}">{$ACCESS}</textarea>
-    </div>
-{/form_field}
 {/form}
\ No newline at end of file
diff --git a/templates/backOffice/default/form/dealer-geo.html b/templates/backOffice/default/form/dealer-geo.html
index 653af7b..3d36576 100644
--- a/templates/backOffice/default/form/dealer-geo.html
+++ b/templates/backOffice/default/form/dealer-geo.html
@@ -39,11 +39,15 @@
                 </div>
             {/form_field}
             {loop name="auth-create" type="auth" role="ADMIN" resource="admin.dealer.geo" access="UPDATE" module="Dealer"}
+
             <div class="btn-grp">
+                <button type="button" id="dealer-googlemaps-get" name="dealer_googlemaps_get" class="btn btn-secondary" title="{intl d='dealer.bo.default' l='Get the coordinate via the address'}">{intl d='dealer.bo.default' l='Get the coordinate via the address'}</button>
                 <button type="submit" class="btn btn-primary">{intl l="Save"}</button>
             </div>
+
+            <div id="dealer-googlemaps-get-info" class="alert" role="alert"></div>
             {/loop}
         </form>
         {/loop}
     </div>
-{/form}
\ No newline at end of file
+{/form}
diff --git a/templates/backOffice/default/module-configuration.html b/templates/backOffice/default/module-configuration.html
new file mode 100644
index 0000000..9b921c5
--- /dev/null
+++ b/templates/backOffice/default/module-configuration.html
@@ -0,0 +1,52 @@
+<div class="modal fade" id="dealer-googletimezone-failed" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3>{intl d='dealer.bo.default' l="An error occured"}</h3>
+            </div>
+            <div class="modal-body" id="dealer-googletimezone-failed-body">
+
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<div class="general-block-decorator">
+    <div class="row">
+
+        <div class="col-md-12 title title-without-tabs">
+            {intl l='Edit your Google Maps API configuration.'} - <span style="text-transform: none;">(<a href="https://developers.google.com/maps/documentation/javascript/get-api-key" target="_blank">{intl l="Get API key" d="dealer.bo.default"}</a>)</span>
+        </div>
+
+        <div class="form-container">
+            <div class="col-md-12">
+
+                {form name="dealer.configuration.form"}
+                <form method="POST" id="dealer-googletimezone-form" action="{url path="/admin/module/Dealer/configure"}" {form_enctype} class="clearfix">
+
+                {form_hidden_fields}
+
+                {form_field field='googlemapsapi_key'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                    <input id="{$label_attr.for}" name="{$name}" class="form-control" title="{$label}" value="{$value}" />
+                </div>
+                {/form_field}
+
+                <button type="submit" id="dealer-save" name="dealer_save" value="save" class="form-submit-button btn btn-sm btn-default" title="{intl d='dealer.bo.default' l='Save'}">{intl d='dealer.bo.default' l='Save'}</button>
+                </form>
+                {/form}
+
+            </div>
+
+        </div>
+
+    </div>
+</div>
+
+
+
+
diff --git a/templates/backOffice/default/script/dealer-geo-js.html b/templates/backOffice/default/script/dealer-geo-js.html
index 604942e..25c59bd 100644
--- a/templates/backOffice/default/script/dealer-geo-js.html
+++ b/templates/backOffice/default/script/dealer-geo-js.html
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="http://maps.google.com/maps/api/js"></script>
+<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?{if $googlemapsapi_key}key={$googlemapsapi_key}{/if}"></script>
 <script>
     (function($){
         $('a[href="#location"]').on("shown.bs.tab",function(){
@@ -33,7 +33,49 @@
                 $("#attr-dealer-geo-lon").val(e.latLng.lng());
             });
 
+            $('#dealer-googlemaps-get').on('click', function(e){
+                removeDealerInfoClassAlert();
+                $('#dealer-googlemaps-get-info').addClass('alert-warning').html("{intl l='<strong>Get the location...</strong>' d='dealer.bo.default'}");
+                var geocoder = new google.maps.Geocoder();
+                geocoder.geocode(
+                    {
+                    'address': "{$address}"
+                    }, function(results, status) {
+                    if (status === google.maps.GeocoderStatus.OK) {
+                        removeDealerInfoClassAlert();
+                        $('#dealer-googlemaps-get-info').addClass('alert-success').html('{intl l='Ok. Remember to <strong>Save</strong> the new coordinates' d='dealer.bo.default'}');
+                        map.setCenter(results[0].geometry.location);
+                        marker.setPosition(results[0].geometry.location);
+                        $("#attr-dealer-geo-lat").val(results[0].geometry.location.lat());
+                        $("#attr-dealer-geo-lon").val(results[0].geometry.location.lng());
 
+                    } else {
+                        removeDealerInfoClassAlert();
+                        $('#dealer-googlemaps-get-info').addClass('alert-danger').html('Geocode was not successful for the following reason: ' + status);
+                    }
+                });
+            });
         });
+
+        //dealer-googlemaps-get
+        {if $googlemapsapi_key == ''}
+            removeDealerInfoClassAlert();
+            $('#dealer-googlemaps-get-info').addClass('alert-warning').html("{intl l='Dealer Google API key is not set. To use this feature you must enter the key.' d='dealer.bo.default'}");
+            $('#dealer-googlemaps-get').prop('disabled', true);
+        {else}
+            {if $address == ''}
+                removeDealerInfoClassAlert();
+                $('#dealer-googlemaps-get-info').addClass('alert-warning').html("{intl l='The address is undefined!' d='dealer.bo.default'}");
+                $('#dealer-googlemaps-get').prop('disabled', true);
+            {else}
+                $('#dealer-googlemaps-get-info').addClass('alert-info').html("{intl l='Click on <strong>Get the coordinate via the address</strong> or enter the value' d='dealer.bo.default'}");
+            {/if}
+        {/if}
+
+        function removeDealerInfoClassAlert(){
+            $('#dealer-googlemaps-get-info').removeClass (function (index, css) {
+                return (css.match (/(^|\s)alert-\S+/g) || []).join(' ');
+            });
+        }
     })(jQuery);
 </script>
\ No newline at end of file