diff -Nru pycircuit-0.0/debian/bzr-builder.manifest pycircuit-0.0/debian/bzr-builder.manifest
--- pycircuit-0.0/debian/bzr-builder.manifest	2012-03-25 10:05:28.000000000 +0000
+++ pycircuit-0.0/debian/bzr-builder.manifest	2012-10-06 17:57:11.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0~535
-lp:pycircuit revid:git-v1:400b39f61e4c22e60385ae00a0f33c670cd3dc0c
+# bzr-builder format 0.3 deb-version {debupstream}-0~536
+lp:pycircuit revid:git-v1:1272fec9ddaf0f1b0901fb5caf6a3dce280b1656
diff -Nru pycircuit-0.0/debian/changelog pycircuit-0.0/debian/changelog
--- pycircuit-0.0/debian/changelog	2012-03-25 10:05:28.000000000 +0000
+++ pycircuit-0.0/debian/changelog	2012-10-06 17:57:11.000000000 +0000
@@ -1,8 +1,8 @@
-pycircuit (0.0-0~535~natty1) unstable; urgency=low
+pycircuit (0.0-0~536~natty1) natty; urgency=low
 
   * Auto build.
 
- -- henjo <henrik@johome.net>  Sun, 25 Mar 2012 10:05:28 +0000
+ -- henjo <henrik@johome.net>  Sat, 06 Oct 2012 17:57:11 +0000
 
 pycircuit (0.0) unstable; urgency=low
 
diff -Nru pycircuit-0.0/pycircuit/circuit/examples/mos_cir.py pycircuit-0.0/pycircuit/circuit/examples/mos_cir.py
--- pycircuit-0.0/pycircuit/circuit/examples/mos_cir.py	1970-01-01 00:00:00.000000000 +0000
+++ pycircuit-0.0/pycircuit/circuit/examples/mos_cir.py	2012-10-06 17:57:10.000000000 +0000
@@ -0,0 +1,20 @@
+#This code finds the gain of a simple common-source amplifier stage, using symgolic toolkit.
+
+from sympy import *
+from pycircuit.circuit import *
+from pycircuit.circuit import mos
+c=SubCircuit(toolkit=symbolic)
+inp=c.add_node('inp')
+out=c.add_node('out')
+vdd=c.add_node('vdd')
+var('R1,gm1,s')
+c['VDD']=VS(vdd,gnd,v=5,vac=0)
+c['R1']=R(vdd,out,r=R1)
+c['Vin']=VS(inp,gnd,v=1,vac=1)
+c['M1']=mos.MOS(inp,out,gnd,gnd,gm=gm1,gds=0,gmb=0,toolkit=symbolic)
+ac=AC(c)
+res=ac.solve(s,complexfreq=True)
+gain=sympy.simplify(res.v('out')/res.v('inp'))
+print "The gain of the CS stage is:"
+sympy.pprint(gain)
+
diff -Nru pycircuit-0.0/pycircuit/circuit/examples/mos_cir_with_caps.py pycircuit-0.0/pycircuit/circuit/examples/mos_cir_with_caps.py
--- pycircuit-0.0/pycircuit/circuit/examples/mos_cir_with_caps.py	1970-01-01 00:00:00.000000000 +0000
+++ pycircuit-0.0/pycircuit/circuit/examples/mos_cir_with_caps.py	2012-10-06 17:57:10.000000000 +0000
@@ -0,0 +1,23 @@
+#This code finds the gain of a CS stage, now considering the intrinsic MOS capacitantes. The results is the same as in the book Design Analog CMOS Integrated Circuits, by Behzad Razavi - pg 174.
+
+from sympy import *
+from pycircuit.circuit import *
+from pycircuit.circuit import mos
+c=SubCircuit(toolkit=symbolic)
+inp=c.add_node('inp')
+inp1=c.add_node('inp1')
+out=c.add_node('out')
+vdd=c.add_node('vdd')
+var('R_L,R_S,gm1,gmb1,ro1,Cgs1,Cgd1,Cdb1,s')
+c['VDD']=VS(vdd,gnd,v=5,vac=0)
+c['R_L']=R(vdd,out,r=R_L)
+c['R_S']=R(inp,inp1,r=R_S)
+c['Vin']=VS(inp,gnd,v=1,vac=1)
+c['M1']=mos.MOS(inp1,out,gnd,gnd,gm=gm1,gds=0,gmb=0,Cgs=Cgs1,Cgd=Cgd1,Cdb=Cdb1,toolkit=symbolic)
+ac=AC(c)
+res=ac.solve(s,complexfreq=True)
+gain=simplify(res.v('out')/res.v('inp'))
+print "\nThe transfer function of the CS stage is:"
+sympy.pprint(gain)
+print "\nShowing the denominator as polynomial:"
+sympy.pprint(denom(gain).as_poly(s))
diff -Nru pycircuit-0.0/pycircuit/circuit/mos.py pycircuit-0.0/pycircuit/circuit/mos.py
--- pycircuit-0.0/pycircuit/circuit/mos.py	2012-03-25 10:05:27.000000000 +0000
+++ pycircuit-0.0/pycircuit/circuit/mos.py	2012-10-06 17:57:10.000000000 +0000
@@ -44,11 +44,13 @@
 
         self['Igm'] = VCCS('g', 's', 
                            'd', 's', 
-                           gm=self.ipar.gm)
+                           gm=self.ipar.gm,
+                           toolkit=self.toolkit)
 
         self['Igmb'] = VCCS('b', 's', 
                             'd', 's', 
-                            gm=self.ipar.gmb)
+                            gm=self.ipar.gmb,
+                            toolkit=self.toolkit)
 
         self['gds'] = G('d', 's', 
                         g = self.ipar.gds, noisy = False)
@@ -103,11 +105,13 @@
 
         self['Igm'] = VCCS('g', 's', 
                            'd', 's', 
-                           gm=self.ipar.gm)
+                           gm=self.ipar.gm,
+                           toolkit=self.toolkit)
 
         self['Igmb'] = VCCS('b', 's', 
                             'd', 's', 
-                            gm=self.ipar.gmb)
+                            gm=self.ipar.gmb,
+                            toolkit=self.toolkit)
 
         self['gds'] = G('d', 's', 
                         g = self.ipar.gds, noisy = False)
diff -Nru pycircuit-0.0/pycircuit/post/cds/cds.py pycircuit-0.0/pycircuit/post/cds/cds.py
--- pycircuit-0.0/pycircuit/post/cds/cds.py	2012-03-25 10:05:27.000000000 +0000
+++ pycircuit-0.0/pycircuit/post/cds/cds.py	2012-10-06 17:57:10.000000000 +0000
@@ -13,7 +13,7 @@
 	if  virtuosocmd == None:
 		raise ValueError("Cannot find virtuoso executable")
 		
-	cmd = virtuosocmd + " -nograph"
+	cmd = virtuosocmd + " -nographE"
 	return cmd
 
 class CadenceSession(object):