diff --git a/src/docblock/Factory.php b/src/docblock/Factory.php
index 369dfdee..b9d0c775 100644
--- a/src/docblock/Factory.php
+++ b/src/docblock/Factory.php
@@ -9,12 +9,15 @@ class Factory {
         'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidParser',
         'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericParser',
 
-        'description' => 'TheSeer\\phpDox\\DocBlock\\DescriptionParser',
-        'param'       => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
-        'var'         => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-        'return'      => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-        'throws'      => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-        'license'     => 'TheSeer\\phpDox\\DocBlock\\LicenseParser',
+        'description'    => 'TheSeer\\phpDox\\DocBlock\\DescriptionParser',
+        'param'          => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+        'property-read'  => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+        'property-write' => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+        'property'       => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+        'var'            => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+        'return'         => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+        'throws'         => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+        'license'        => 'TheSeer\\phpDox\\DocBlock\\LicenseParser',
 
         'internal'   => 'TheSeer\\phpDox\\DocBlock\\InternalParser',
         'inheritdoc' => 'TheSeer\\phpDox\\DocBlock\\InheritdocParser'
diff --git a/src/docblock/Parser.php b/src/docblock/Parser.php
index b8e093aa..6722f716 100644
--- a/src/docblock/Parser.php
+++ b/src/docblock/Parser.php
@@ -41,7 +41,7 @@ public function parse($block, array $aliasMap) {
                 }
                 $buffer = [];
 
-                \preg_match('/^\@([a-zA-Z0-9_]+)(.*)$/', $line, $lineParts);
+                \preg_match('/^\@([a-zA-Z0-9_-]+)(.*)$/', $line, $lineParts);
                 $name    = ($lineParts[1] ?? '(undefined)');
                 $payload = (isset($lineParts[2]) ? \trim($lineParts[2]) : '');
 
diff --git a/templates/html/components.xsl b/templates/html/components.xsl
index 6bf1b7e2..435bcac4 100644
--- a/templates/html/components.xsl
+++ b/templates/html/components.xsl
@@ -287,11 +287,61 @@
                     </xsl:for-each>
                 </ul>
             </xsl:if>
+            <xsl:if test="//pdx:docblock/pdx:property">
+                <h4>magic</h4>
+                <ul class="members">
+                    <xsl:for-each select="//pdx:docblock/pdx:property">
+                        <xsl:sort select="@variable" />
+                        <xsl:call-template name="magicmemberli" />
+                    </xsl:for-each>
+                </ul>
+            </xsl:if>
+            <xsl:if test="//pdx:docblock/pdx:property-read">
+                <h4>magic — Read only</h4>
+                <ul class="members">
+                    <xsl:for-each select="//pdx:docblock/pdx:property-read">
+                        <xsl:sort select="@variable" />
+                        <xsl:call-template name="magicmemberli" />
+                    </xsl:for-each>
+                </ul>
+            </xsl:if>
+            <xsl:if test="//pdx:docblock/pdx:property-write">
+                <h4>magic — Write only</h4>
+                <ul class="members">
+                    <xsl:for-each select="//pdx:docblock/pdx:property-write">
+                        <xsl:sort select="@variable" />
+                        <xsl:call-template name="magicmemberli" />
+                    </xsl:for-each>
+                </ul>
+            </xsl:if>
         </div>
     </xsl:template>
 
     <!-- ######################################################################################################### -->
 
+    <xsl:template name="magicmemberli">
+        <li id="{@variable}">
+            <strong><xsl:value-of select="@variable" /></strong>
+            <xsl:if test="@type">
+                —
+                <xsl:choose>
+                    <xsl:when test="@type = 'object'">
+                        <xsl:copy-of select="pdxf:link(pdx:type, '', pdx:type/@full)" />
+                    </xsl:when>
+                    <xsl:otherwise><xsl:value-of select="@type" /></xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+            <xsl:if test="@description != ''">
+                <br/>
+                <span class="indent">
+                    <xsl:value-of select="@description" />
+                </span>
+            </xsl:if>
+        </li>
+    </xsl:template>
+
+    <!-- ######################################################################################################### -->
+
     <xsl:template name="memberli">
         <li id="{@name}">
             <strong>$<xsl:value-of select="@name" /></strong>
diff --git a/templates/html/synopsis.xsl b/templates/html/synopsis.xsl
index 994f47c1..46f5385f 100644
--- a/templates/html/synopsis.xsl
+++ b/templates/html/synopsis.xsl
@@ -74,6 +74,21 @@
                     </xsl:choose></xsl:if>;
                     </li>
                 </xsl:for-each>
+                <xsl:for-each select="$unit/pdx:docblock/*[self::pdx:property or self::pdx:property-read or self::pdx:property-write]">
+                    <li>
+                        <i>magic<xsl:if test="local-name() = 'property-read'"> (r/o)</xsl:if><xsl:if test="local-name() = 'property-write'"> (w/o)</xsl:if></i>&#160;<xsl:choose>
+                            <xsl:when test="@type = 'object'">
+                                <xsl:value-of select="pdx:type/@name" />
+                            </xsl:when>
+                            <xsl:when test="@type = '{unknown}'">
+                                <xsl:text>object</xsl:text>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="@type" />
+                            </xsl:otherwise>
+                        </xsl:choose>&#160;<a href="#members"><xsl:value-of select="@variable" /></a>;
+                    </li>
+                </xsl:for-each>
             </ul>
             </xsl:if>
 
diff --git a/tests/Integration/docblock/FactoryTest.php b/tests/Integration/docblock/FactoryTest.php
index e15b31c5..c0874c5b 100644
--- a/tests/Integration/docblock/FactoryTest.php
+++ b/tests/Integration/docblock/FactoryTest.php
@@ -25,11 +25,14 @@ public static function getInstanceMapDataprovider() {
             'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidParser',
             'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericParser',
 
-            'description' => 'TheSeer\\phpDox\\DocBlock\\DescriptionParser',
-            'param'       => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
-            'var'         => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-            'return'      => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-            'license'     => 'TheSeer\\phpDox\\DocBlock\\LicenseParser',
+            'description'    => 'TheSeer\\phpDox\\DocBlock\\DescriptionParser',
+            'param'          => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+            'property-read'  => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+            'property-write' => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+            'property'       => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+            'var'            => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+            'return'         => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+            'license'        => 'TheSeer\\phpDox\\DocBlock\\LicenseParser',
 
             'internal' => 'TheSeer\\phpDox\\DocBlock\\InternalParser'
         ];
diff --git a/tests/Integration/docblock/ParserTest.php b/tests/Integration/docblock/ParserTest.php
index d478479a..7abb07a8 100644
--- a/tests/Integration/docblock/ParserTest.php
+++ b/tests/Integration/docblock/ParserTest.php
@@ -56,6 +56,7 @@ public function docblockSources() {
             ['param_without_description'],
             ['param_without_varname'],
             ['param_without_varname_and_description'],
+            ['property'],
             ['see'],
             ['since'],
             ['throws'],
diff --git a/tests/data/docbock/property b/tests/data/docbock/property
new file mode 100644
index 00000000..99e23d7a
--- /dev/null
+++ b/tests/data/docbock/property
@@ -0,0 +1,5 @@
+/**
+ * @property int $state The class state
+ * @property-read int $pastState The previous class state
+ * @property-write int $call The number or call
+ */
diff --git a/tests/data/docbock/property.xml b/tests/data/docbock/property.xml
new file mode 100644
index 00000000..0750b308
--- /dev/null
+++ b/tests/data/docbock/property.xml
@@ -0,0 +1 @@
+<docblock xmlns="http://xml.phpdox.net/src"><description/><property type="int" variable="$state" description="The class state"/><property-read description="The previous class state" type="int" variable="$pastState"/><property-write description="The number or call" type="int" variable="$call"/></docblock>