diff --git a/composer.json b/composer.json
index 58a9644d..1045169f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-    "name": "proengsoft/laravel-jsvalidation",
+    "name": "thisismahabadi/laravel-jsvalidation",
     "type": "library",
     "description": "Validate forms transparently with Javascript reusing your Laravel Validation Rules, Messages, and FormRequest",
     "keywords": [
-        "proengsoft",
+        "thisismahabadi",
         "laravel",
         "javascript",
         "validator",
@@ -11,7 +11,7 @@
         "jquery",
         "form"
     ],
-    "homepage": "https://github.com/proengsoft/laravel-jsvalidation",
+    "homepage": "https://github.com/thisismahabadi/laravel-jsvalidation",
     "license": "MIT",
     "authors": [
         {
@@ -42,21 +42,21 @@
     },
     "autoload": {
         "psr-4": {
-            "Proengsoft\\JsValidation\\": "src"
+            "thisismahabadi\\JsValidation\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Proengsoft\\JsValidation\\Tests\\": "tests"
+            "thisismahabadi\\JsValidation\\Tests\\": "tests"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Proengsoft\\JsValidation\\JsValidationServiceProvider"
+                "thisismahabadi\\JsValidation\\JsValidationServiceProvider"
             ],
             "aliases": {
-                "JsValidator": "Proengsoft\\JsValidation\\Facades\\JsValidatorFacade"
+                "JsValidator": "thisismahabadi\\JsValidation\\Facades\\JsValidatorFacade"
             }
         }
     },
diff --git a/resources/views/bootstrap.php b/resources/views/bootstrap.php
index f426edf4..890ef5bc 100644
--- a/resources/views/bootstrap.php
+++ b/resources/views/bootstrap.php
@@ -11,6 +11,8 @@
                         element.prop('type') === 'checkbox' || element.prop('type') === 'radio') {
                         error.insertAfter(element.parent());
                         // else just place the validation message immediately after the input
+                    } else if (element.hasClass('select2') && element.next('.select2-container').length) {
+                        error.insertAfter(element.next('.select2-container'));
                     } else {
                         error.insertAfter(element);
                     }