diff --git a/C4_Component.puml b/C4_Component.puml
index d7550845..0dc7953c 100644
--- a/C4_Component.puml
+++ b/C4_Component.puml
@@ -58,18 +58,18 @@ endlegend
 ' ##################################
 
 !function $getComponent($label, $techn, $descr, $sprite)
-!if ($descr == "") && ($sprite == "")
-!return '=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//'
-!endif
-!if ($descr == "") && ($sprite != "")
-!return $getSprite($sprite)+'\n=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//'
-!endif
-!if ($descr != "") && ($sprite == "")
-!return '=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//\n\n '+$descr
-!endif
-!if ($descr != "") && ($sprite != "")
-!return $getSprite($sprite)+'\n=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//\n\n '+$descr
-!endif
+  !$component = ""
+  !if ($sprite != "")
+    !$component = $component + $getSprite($sprite) + '\n'
+  !endif
+  !$component = $component + '==' + $label
+  !if ($techn != "")
+    !$component = $component + '\n//<size:' + $TECHN_FONT_SIZE + '>[' + $techn + ']</size>//'
+  !endif
+  !if ($descr != "")
+    !$component = $component + '\n\n' + $descr
+  !endif
+  !return $component
 !endfunction
 
 !unquoted procedure Component($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
diff --git a/C4_Container.puml b/C4_Container.puml
index b020232b..ab642a6f 100644
--- a/C4_Container.puml
+++ b/C4_Container.puml
@@ -53,18 +53,18 @@ endlegend
 ' ##################################
 
 !function $getContainer($label, $techn, $descr, $sprite)
-!if ($descr == "") && ($sprite == "")
-!return '=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//'
-!endif
-!if ($descr == "") && ($sprite != "")
-!return $getSprite($sprite)+'\n=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//'
-!endif
-!if ($descr != "") && ($sprite == "")
-!return '=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//\n\n '+$descr
-!endif
-!if ($descr != "") && ($sprite != "")
-!return $getSprite($sprite)+'\n=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//\n\n '+$descr
-!endif
+  !$container = ""
+  !if ($sprite != "")
+    !$container = $container + $getSprite($sprite) + '\n'
+  !endif
+  !$container = $container + '==' + $label
+  !if ($techn != "")
+    !$container = $container + '\n//<size:' + $TECHN_FONT_SIZE + '>[' + $techn + ']</size>//'
+  !endif
+  !if ($descr != "")
+    !$container = $container + '\n\n' + $descr
+  !endif
+  !return $container
 !endfunction
 
 !unquoted procedure Container($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
diff --git a/README.md b/README.md
index 7bf1ed61..4194b0af 100644
--- a/README.md
+++ b/README.md
@@ -160,7 +160,6 @@ SHOW_LEGEND()
 
 > * `arg`.. argument required (e.g. `alias`)
 > * `?arg`.. argument optional  (e.g. `?descr`)
-> * `*techn` .. technology argument is required, but if the technology is defined via $tags then no `techn` argument is required
 
 * System Context & System Landscape diagrams
   * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml`
@@ -180,7 +179,7 @@ SHOW_LEGEND()
 * Container diagram
   * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Container.puml`
   * Additional Macros: 
-    * `Container(alias, label, *techn, ?descr, ?sprite, ?tags, $link)`
+    * `Container(alias, label, ?techn, ?descr, ?sprite, ?tags, $link)`
     * `ContainerDb`
     * `ContainerQueue`
     * `Container_Ext`
@@ -191,7 +190,7 @@ SHOW_LEGEND()
 * Component diagram
   * Import: `!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml`
   * Additional Macros: 
-    * `Component(alias, label, *techn, ?descr, ?sprite, ?tags, $link)`
+    * `Component(alias, label, ?techn, ?descr, ?sprite, ?tags, $link)`
     * `ComponentDb`
     * `ComponentQueue`
     * `Component_Ext`