diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..9ec525e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.{json,lock,yml,less,scss,sass}]
+indent_size = 2
\ No newline at end of file
diff --git a/composer.json b/composer.json
index a8b9d75..a2aab93 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,27 @@
 {
-    "name": "andres-montanez/magallanes",
+  "name": "cyberhouse/magallanes",
     "description": "A Deployment Tool for PHP Applications",
     "homepage": "http://magephp.com",
     "license": "MIT",
     "type": "library",
+    "authors": [
+        {
+            "name": "Andrés Montañez",
+            "role": "Developer"
+        },
+        {
+            "name": "Johannes Pichler",
+            "email": "johannes.pichler@cyberhouse.at",
+            "homepage": "https://www.cyberhouse.at",
+            "role": "Developer"
+        },
+        {
+            "name": "Georg Großberger",
+            "email": "georg.grossberger@cyberhouse.ats",
+            "homepage": "https://www.cyberhouse.at",
+            "role": "Developer"
+        }
+    ],
     "keywords": ["deployment"],
     "require": {
         "php": ">=5.3"