diff --git a/src/Templates/ModuleInfo.tmpl.php b/src/Templates/ModuleInfo.tmpl.php
index 7fddce0b..6557821c 100644
--- a/src/Templates/ModuleInfo.tmpl.php
+++ b/src/Templates/ModuleInfo.tmpl.php
@@ -221,21 +221,21 @@
                                     <?php } ?>
                                 </p>
                             </div>
-                        </div>                        
+                        </div>
 
                         <div class="tab-pane fade" id="v-pills-install" role="tabpanel" aria-labelledby="v-pills-install-tab">
                             <div class="markdown-body">
                                 Wird geladen. Bitte warten...
                             </div>
                         </div>
-                        
+
 
                         <div class="tab-pane fade" id="v-pills-usage" role="tabpanel" aria-labelledby="v-pills-usage-tab">
                             <div class="markdown-body">
                                 Wird geladen. Bitte warten...
                             </div>
                         </div>
-                        
+
 
                         <div class="tab-pane fade" id="v-pills-changes" role="tabpanel" aria-labelledby="v-pills-changes-tab">
                             <div class="markdown-body changelog">
@@ -294,6 +294,17 @@
                                             </td>
                                         </tr>
 
+                                        <tr>
+                                            <td>Website</td>
+                                            <td>
+                                                <?php if ($module->getWebsite()) { ?>
+                                                    <a target="_blank" href="<?= $module->getWebsite() ?>"><?= $module->getWebsite() ?></a>
+                                                <?php } else { ?>
+                                                    unbekannte Website
+                                                <?php } ?>
+                                            </td>
+                                        </tr>
+
                                         <tr>
                                             <td>Alle Versionen</td>
                                             <td>
diff --git a/src/Templates/ModuleListingModule.tmpl.php b/src/Templates/ModuleListingModule.tmpl.php
index 88cdbd04..a68c377e 100644
--- a/src/Templates/ModuleListingModule.tmpl.php
+++ b/src/Templates/ModuleListingModule.tmpl.php
@@ -18,7 +18,8 @@
 
 $modulePrice = $module->isInstalled() ? 'installiert' : $moduleView->getPriceFormated();
 $moduleLink = '?action=moduleInfo&archiveName=' . $module->getArchiveName() . '&version=' . $module->getVersion();
-
+$moduleDeveloper = $module->getDeveloper();
+$moduleDeveloperWebsite = $module->getDeveloperWebsite();
 ?>
 
 <div class="card module-serach-box <?= $module->isCompatible() ? 'compatible' : 'incompatible'; ?>" data-tags="<?= $dataTags ?>">
@@ -30,6 +31,13 @@
         <h5 class="card-title">
             <?= $module->getName(); ?>
             <span class="card-version"><?= $module->getVersion(); ?></span>
+            <div class="card-developer">
+                <?php if ($moduleDeveloperWebsite) { ?>
+                    <a href="<?= $moduleDeveloperWebsite; ?>"><?= $moduleDeveloper ?></a>
+                <?php } else { ?>
+                    <?= $moduleDeveloper ?>
+                <?php } ?>
+            </div>
         </h5>
 
         <div class="module-price">
@@ -44,4 +52,4 @@
 
         <a href="<?= $moduleLink ?>" class="btn <?= $module->isCompatible() ? 'btn-primary' : 'btn-secondary'; ?>">Details</a>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Templates/Styles/style.css b/src/Templates/Styles/style.css
index 4a14a631..fa823b85 100644
--- a/src/Templates/Styles/style.css
+++ b/src/Templates/Styles/style.css
@@ -71,7 +71,7 @@ select + p {
 
 select.form-control {
     height: 38px !important;
-} 
+}
 
 h1,
 h2,
@@ -188,6 +188,11 @@ section {
     color: var(--gray);
 }
 
+.modules .category .card .card-developer {
+    font-size: 0.8rem;
+    margin-top: 0.2rem;
+}
+
 .modules .category .card .module-price {
     font-size: 1.25em;
     color: var(--blue);
diff --git a/tests/unit/RemoteModuleLoaderTest.php b/tests/unit/RemoteModuleLoaderTest.php
index 8c340220..4409ed58 100644
--- a/tests/unit/RemoteModuleLoaderTest.php
+++ b/tests/unit/RemoteModuleLoaderTest.php
@@ -67,7 +67,7 @@ public function testCanLoadLatestVersionByArchiveName()
         $module = $this->loader->loadLatestVersionByArchiveName('composer/autoload');
 
         $this->assertEquals('composer/autoload', $module->getArchiveName());
-        $this->assertEquals('1.2.2', $module->getVersion());
+        $this->assertEquals('1.3.0', $module->getVersion());
     }
 
     public function testCanLoadByArchiveNameAndVersion()