diff --git a/doc/asn1c-usage.html b/doc/asn1c-usage.html
index 03bfd4b..106ebba 100644
--- a/doc/asn1c-usage.html
+++ b/doc/asn1c-usage.html
@@ -488,7 +488,7 @@
 <BLOCKQUOTE><PRE>
 Rectangle_t&nbsp;*rect&nbsp;=&nbsp;...;
 &nbsp;
-asn_DEF_Rectangle-&gt;free_struct(&amp;asn_DEF_Rectangle,
+asn_DEF_Rectangle.free_struct(&amp;asn_DEF_Rectangle,
 &nbsp;&nbsp;&nbsp;&nbsp;rect,&nbsp;0);
 </PRE>
 </BLOCKQUOTE>
@@ -603,7 +603,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;Rectangle_t&nbsp;*rect&nbsp;=&nbsp;0;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Note&nbsp;this&nbsp;0!&nbsp;*/
 &nbsp;&nbsp;&nbsp;&nbsp;asn_dec_rval_t&nbsp;rval;
 &nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;rval&nbsp;=&nbsp;<B>asn_DEF_Rectangle-&gt;ber_decoder</B>(0,
+&nbsp;&nbsp;&nbsp;&nbsp;rval&nbsp;=&nbsp;<B>asn_DEF_Rectangle.ber_decoder</B>(0,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&amp;asn_DEF_Rectangle,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(void&nbsp;**)&amp;rect,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;buffer,&nbsp;buf_size,
@@ -613,7 +613,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;rect;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Decoding&nbsp;succeeded&nbsp;*/
 &nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Free&nbsp;partially&nbsp;decoded&nbsp;rect&nbsp;*/
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;asn_DEF_Rectangle-&gt;free_struct(
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;asn_DEF_Rectangle.free_struct(
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&amp;asn_DEF_Rectangle,&nbsp;rect,&nbsp;0);
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;
 &nbsp;&nbsp;&nbsp;&nbsp;}
@@ -645,7 +645,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;buffer,&nbsp;buf_size);
 </PRE>
 </BLOCKQUOTE>
-Note that the initial (asn_DEF_Rectangle-&gt;ber_decoder) reference
+Note that the initial (asn_DEF_Rectangle.ber_decoder) reference
 is gone, and also the last argument (0) is no longer necessary.
 
 <P>
@@ -815,7 +815,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;rect;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Decoding&nbsp;succeeded&nbsp;*/
 &nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Free&nbsp;partially&nbsp;decoded&nbsp;rect&nbsp;*/
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;asn_DEF_Rectangle-&gt;free_struct(
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;asn_DEF_Rectangle.free_struct(
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&amp;asn_DEF_Rectangle,&nbsp;rect,&nbsp;0);
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;
 &nbsp;&nbsp;&nbsp;&nbsp;}
@@ -946,7 +946,7 @@
 &nbsp;*&nbsp;Freeing&nbsp;the&nbsp;Rectangle_t
 &nbsp;*&nbsp;without&nbsp;freeing&nbsp;the&nbsp;mf-&gt;rect&nbsp;area
 &nbsp;*/
-asn_DEF_Rectangle-&gt;free_struct(
+asn_DEF_Rectangle.free_struct(
 &nbsp;&nbsp;&nbsp;&nbsp;&amp;asn_DEF_Rectangle,&nbsp;&amp;mf-&gt;rect,&nbsp;<B>1</B>&nbsp;<B>/*&nbsp;!free&nbsp;*/</B>);
 &nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;
@@ -956,7 +956,7 @@
 &nbsp;*&nbsp;Freeing&nbsp;the&nbsp;Rectangle_t
 &nbsp;*&nbsp;and&nbsp;freeing&nbsp;the&nbsp;rect&nbsp;pointer
 &nbsp;*/
-asn_DEF_Rectangle-&gt;free_struct(
+asn_DEF_Rectangle.free_struct(
 &nbsp;&nbsp;&nbsp;&nbsp;&amp;asn_DEF_Rectangle,&nbsp;rect,&nbsp;<B>0</B>&nbsp;<B>/*&nbsp;free&nbsp;the&nbsp;pointer&nbsp;too&nbsp;*/</B>);
 </PRE>
 </BLOCKQUOTE>
@@ -1295,7 +1295,7 @@
 &nbsp;<FONT SIZE="-1">&nbsp;</FONT>
 <FONT SIZE="-1">/*&nbsp;...&nbsp;here&nbsp;may&nbsp;go&nbsp;Rectangle&nbsp;decoding&nbsp;code&nbsp;...&nbsp;*/</FONT>
 &nbsp;
-<FONT SIZE="-1">ret&nbsp;=&nbsp;asn_check_constraints(asn_DEF_Rectangle,</FONT>
+<FONT SIZE="-1">ret&nbsp;=&nbsp;asn_check_constraints(&amp;asn_DEF_Rectangle,</FONT>
 &nbsp;<FONT SIZE="-1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rectangle,&nbsp;errbuf,&nbsp;&amp;errlen);</FONT>
 <FONT SIZE="-1">/*&nbsp;assert(errlen&nbsp;&lt;&nbsp;sizeof(errbuf));&nbsp;//&nbsp;you&nbsp;may&nbsp;rely&nbsp;on&nbsp;that&nbsp;*/</FONT>
 <FONT SIZE="-1">if(ret)&nbsp;{</FONT>
diff --git a/doc/asn1c-usage.lyx b/doc/asn1c-usage.lyx
index 4e9750f..3c6ed97 100644
--- a/doc/asn1c-usage.lyx
+++ b/doc/asn1c-usage.lyx
@@ -71,7 +71,7 @@
 \backslash 
 lhead{This document describes 
 \backslash 
-href{http://lionet.info/asn1c}{asn1c-0.9.17}}
+href{http://lionet.info/asn1c}{asn1c-0.9.18}}
 \layout Standard
 
 \backslash 
@@ -1104,7 +1104,7 @@
  
 \layout LyX-Code
 
-asn_DEF_Rectangle->free_struct(&asn_DEF_Rectangle,
+asn_DEF_Rectangle.free_struct(&asn_DEF_Rectangle,
 \layout LyX-Code
 
     rect, 0);
@@ -1303,7 +1303,7 @@
 
     rval = 
 \series bold 
-asn_DEF_Rectangle->ber_decoder
+asn_DEF_Rectangle.ber_decoder
 \series default 
 (0,
 \layout LyX-Code
@@ -1339,7 +1339,7 @@
         /* Free partially decoded rect */
 \layout LyX-Code
 
-        asn_DEF_Rectangle->free_struct(
+        asn_DEF_Rectangle.free_struct(
 \layout LyX-Code
 
             &asn_DEF_Rectangle, rect, 0);
@@ -1395,7 +1395,7 @@
     buffer, buf_size);
 \layout Standard
 
-Note that the initial (asn_DEF_Rectangle->ber_decoder) reference is gone,
+Note that the initial (asn_DEF_Rectangle.ber_decoder) reference is gone,
  and also the last argument (0) is no longer necessary.
 \layout Standard
 
@@ -1737,7 +1737,7 @@
         /* Free partially decoded rect */
 \layout LyX-Code
 
-        asn_DEF_Rectangle->free_struct(
+        asn_DEF_Rectangle.free_struct(
 \layout LyX-Code
 
             &asn_DEF_Rectangle, rect, 0);
@@ -1920,7 +1920,7 @@
  */
 \layout LyX-Code
 
-asn_DEF_Rectangle->free_struct(
+asn_DEF_Rectangle.free_struct(
 \layout LyX-Code
 
     &asn_DEF_Rectangle, &mf->rect, 
@@ -1965,7 +1965,7 @@
  */
 \layout LyX-Code
 
-asn_DEF_Rectangle->free_struct(
+asn_DEF_Rectangle.free_struct(
 \layout LyX-Code
 
     &asn_DEF_Rectangle, rect, 
@@ -3109,7 +3109,7 @@
 
 
 \size small 
-ret = asn_check_constraints(asn_DEF_Rectangle,
+ret = asn_check_constraints(&asn_DEF_Rectangle,
 \layout LyX-Code
 
 
diff --git a/doc/asn1c-usage.pdf b/doc/asn1c-usage.pdf
index bd3f3f6..6efd7e2 100644
--- a/doc/asn1c-usage.pdf
+++ b/doc/asn1c-usage.pdf
Binary files differ