Merge branch 'release/v3.2.0' into developmentdevelopment

4 files changed, 8 insertions, 2 deletions

diff --git a/.yardopts b/.yardopts
new file mode 100644
index 0000000..1217a60
--- /dev/null
+++ b/.yardopts
@@ -0,0 +1 @@
+yardoc - README.markdown ChangeLog LICENSE
diff --git a/ChangeLog b/ChangeLog
index b45a9d7..e15e64d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+v4.0.0 2012-07-12
+	* fminer addition of compounds fixed
+	* improved performance for CSV download
+	* switch to opentox-ruby version 4.0.0
+
 2012-04-20
 	* Support for joelib and openbabel descriptors in a completely unified interface with CDK (Ambit)
 	* Features can have multiple types (nominal and numeric), PC descriptors have detailed meta data
diff --git a/README.markdown b/README.markdown
index 79bdab2..d69b28f 100644
--- a/README.markdown
+++ b/README.markdown
@@ -38,4 +38,4 @@ This example shows how to create a lazar model and predict a compound, it assume
 Copyright
 ---------
 
-Copyright (c) 2009-2011 Christoph Helma, Martin Guetlein, Micha Rautenberg, Andreas Maunz, David Vorgrimmler, Denis Gebele. See LICENSE for details.
+Copyright (c) 2009-2012 Christoph Helma, Martin Guetlein, Micha Rautenberg, Andreas Maunz, David Vorgrimmler, Denis Gebele. See LICENSE for details.
diff --git a/VERSION b/VERSION
index fd2a018..fcdb2e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0
+4.0.0