diff --git a/pyproject.toml b/pyproject.toml
index 15f1bd5..ff2942d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sphinxcontrib-d2lang"
-version = "0.0.4"
+version = "0.0.5"
 authors = [
   { name="Milka64", email="michael.ricart@0w.tf" },
 ]
diff --git a/setup.py b/setup.py
index d689b35..9ea7d18 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ with open('README.md', 'r', encoding='utf8') as file:
 
 setup(
     name='sphinxcontrib-d2lang',
-    version='0.0.4',
+    version='0.0.5',
     author='Milka64',
     author_email='michael.ricart@0w.tf',
     url='https://git.0w.tf/Milka64/sphinx-d2lang/',
diff --git a/sphinxcontrib/d2lang/d2lang.py b/sphinxcontrib/d2lang/d2lang.py
index 20fb651..755de18 100644
--- a/sphinxcontrib/d2lang/d2lang.py
+++ b/sphinxcontrib/d2lang/d2lang.py
@@ -13,20 +13,35 @@ import uuid
 class D2langDirective(SphinxDirective):
     required_arguments = 0
     has_content = True
-    optional_arguments = 3
+    optional_arguments = 5
     option_spec = {
         'layout': directives.unchanged_required,
         'filename': directives.unchanged_required,
+        'width': directives.unchanged_required,
+        'height': directives.unchanged_required,
     }
     def run(self):
         d2_bin = which('d2')
         srcdir = self.state.document.settings.env.srcdir
         diag_source = self.content
-        out_dir = self.state.document.current_source.rsplit("/",1)[0]
+        #out_dir = self.state.document.current_source.rsplit("/",1)[0]
+        out_dir = self.state.document.current_source.replace(str(self.state.document.settings.env.srcdir)+"/", "").rsplit("/",1)[0]
+        print("############### " + out_dir)
+        width = "100%"
+        height = "100%"
+        if "width" in self.options:
+            width = self.options.get("width")
+        if "height" in self.options:
+            height = self.options.get("height")
         if 'filename' in self.options:
             output_fname = out_dir + "/" + self.options.get('filename')
         else:
-            output_fname = out_dir + "/" + "d2lang_svg/" + str(uuid.uuid4()) + ".svg"
+            if out_dir.endswith(".rst") or out_dir.endswith(".md"):
+                if "/" in out_dir:
+                    out_dir = out_dir.rsplit("/",1)[0]
+                else:
+                    out_dir = ""
+            output_fname = out_dir + "/" + str(uuid.uuid4()) + ".svg"
         if 'layout' in self.options:
             layout = self.options.get('layout')
         else:
@@ -48,8 +63,17 @@ class D2langDirective(SphinxDirective):
                     fp.write(bytes(line,'utf-8'))
                     fp.write(bytes('\n','utf-8'))
                 fp.seek(0)
-                build_svg(fp.name, srcdir, output_fname, layout)
-        image_node = nodes.image(uri=output_fname)
+                build_svg(
+                    fp.name, 
+                    srcdir, 
+                    output_fname, 
+                    layout
+                )
+        image_node = nodes.image(
+            uri=output_fname.replace(out_dir+"/",""),
+            width=width,
+            height=height,
+        )
         return [image_node]
 
 def build_svg(diag_src, out_dir, filename, layout):