Merge branch 'dev'

Conflicts:
	README.rst

diff --cc README.rst
index fa5e292bf102120a00eba60a6efeec7e5d6fd62d,5570066047a0169e839ecbf2f4689fb904c2f6b6..eadbf16f560254be23a5889480bb9c0ac349673c
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -228,13 -157,13 +157,12 @@@ The encoded OGG file should also be the
  
  Note you can also instanciate each processor with its own class::
  
-  >>> decoder  =  timeside.decoder.file.FileDecoder('sweep.wav')
-  >>> grapher  =  timeside.grapher.waveform_simple.Waveform()
-  >>> analyzer =  timeside.analyzer.level.Level()
-  >>> encoder  =  timeside.encoder.ogg.VorbisEncoder('sweep.ogg')
+  decoder  =  timeside.decoder.file.FileDecoder('sweep.wav')
+  grapher  =  timeside.grapher.waveform_simple.Waveform()
+  analyzer =  timeside.analyzer.level.Level()
+  encoder  =  timeside.encoder.ogg.VorbisEncoder('sweep.ogg')
  
  For more extensive examples, please see the `full documentation <http://files.parisson.com/timeside/doc/>`_.
--
  API / Documentation
  ====================