Index: doc/conf.py
===================================================================
diff -u -r0593ee55c602b6e1300bda1b40659a53edad2067 -rca550c98b8b75a453fe2ff806ab92a6595d146a6
--- doc/conf.py	(.../conf.py)	(revision 0593ee55c602b6e1300bda1b40659a53edad2067)
+++ doc/conf.py	(.../conf.py)	(revision ca550c98b8b75a453fe2ff806ab92a6595d146a6)
@@ -19,16 +19,32 @@
 
 html_theme_path = ["."]
 
+from mock import Mock as MagicMock
 
+class Mock(MagicMock):
+    __all__ = []
+    __version__ = "1.6"
+    @classmethod
+    def __getattr__(cls, name):
+            return Mock()
+ 
+MOCK_MODULES = ['osgeo.gdal','osgeo.gdalconst','numpy', 'scipy', 'matplotlib', 'matplotlib.pyplot',
+                'scipy.interpolate','osgeo','netCDF4',
+                '_pcraster','numpy.ma']
+
+
+sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
+
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('../wflow-py/wflow/'))
-sys.path.insert(0, os.path.abspath('../wflow-py/'))
-sys.path.insert(0, os.path.abspath('../wflow-py/Scripts/'))
+#sys.path.insert(0, os.path.abspath('../wflow-py/wflow/'))
+#sys.path.insert(0, os.path.abspath('../wflow-py/'))
+#sys.path.insert(0, os.path.abspath('../wflow-py/Scripts/'))
 
 import wflow
-from wflow import *
+#from wflow import *
 
 # -- General configuration -----------------------------------------------------
 
@@ -37,20 +53,27 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+# extensions = ['sphinx.ext.todo','sphinx.ext.pngmath' ,
+#           'matplotlib.sphinxext.only_directives',
+#           'matplotlib.sphinxext.plot_directive',
+#           'sphinx.ext.autodoc',
+#           'sphinx.ext.graphviz',
+#           'sphinx.ext.doctest']
+
 extensions = ['sphinx.ext.todo','sphinx.ext.pngmath' ,
-          'matplotlib.sphinxext.only_directives',
-          'matplotlib.sphinxext.plot_directive',
           'sphinx.ext.autodoc',
           'sphinx.ext.graphviz',
           'sphinx.ext.doctest']
 
+
 todo_include_todos=True
 # Add any paths that contain templates here, relative to this directory.
 #templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
 
+print sys.path
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
@@ -59,7 +82,7 @@
 
 # General information about the project.
 project = u'wflow'
-copyright = u'2013-2014, Deltares/Jaap Schellekens'
+copyright = u'2013-2015, Deltares/Jaap Schellekens'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
Index: wflow-py/_version.py
===================================================================
diff -u -r528bb2cacf4ab3b10799a8b1cc47ca151a2ad986 -rca550c98b8b75a453fe2ff806ab92a6595d146a6
--- wflow-py/_version.py	(.../_version.py)	(revision 528bb2cacf4ab3b10799a8b1cc47ca151a2ad986)
+++ wflow-py/_version.py	(.../_version.py)	(revision ca550c98b8b75a453fe2ff806ab92a6595d146a6)
@@ -1,2 +1,2 @@
-VERSION="203-210 $Id: mkversion.py 550 2012-11-27 19:17:46Z schelle $"
-MVERSION="1.0-RC8-fin-203-210"
+VERSION="a1 $Id: mkversion.py 550 2012-11-27 19:17:46Z schelle $"
+MVERSION="2015.01.a1"
Index: wflow-py/mkversion.py
===================================================================
diff -u -rdc7ea35d85354e33dd2d2385d237315260d3a75f -rca550c98b8b75a453fe2ff806ab92a6595d146a6
--- wflow-py/mkversion.py	(.../mkversion.py)	(revision dc7ea35d85354e33dd2d2385d237315260d3a75f)
+++ wflow-py/mkversion.py	(.../mkversion.py)	(revision ca550c98b8b75a453fe2ff806ab92a6595d146a6)
@@ -1,12 +1,12 @@
 import os
 
 thisversion = "$Id: mkversion.py 550 2012-11-27 19:17:46Z schelle $"
-vers=os.popen('svnversion -n').read().replace(":","-")
-
+#vers=os.popen('svnversion -n').read().replace(":","-")
+vers='a1'
 # SET THESE
 ###################################
-manualversion = "1.0-RC8-fin" + "-" + vers
-manualmainversion = "1.0-fin"
+manualversion = "2015.01." + vers
+manualmainversion = "2015.01"
 ###################################
 a = open("_version.py","w")
 
Index: wflow-py/setup.py
===================================================================
diff -u -r5cf74bfdd89176533f27073418890cb292257f45 -rca550c98b8b75a453fe2ff806ab92a6595d146a6
--- wflow-py/setup.py	(.../setup.py)	(revision 5cf74bfdd89176533f27073418890cb292257f45)
+++ wflow-py/setup.py	(.../setup.py)	(revision ca550c98b8b75a453fe2ff806ab92a6595d146a6)
@@ -8,7 +8,7 @@
 from setuptools import find_packages
 here = os.path.abspath(os.path.dirname(__file__))
 
-README = open(os.path.join(here, 'README.rst')).read()
+README = open(os.path.join(here, '..\README.rst')).read()
 TODO = open(os.path.join(here, 'TODO.txt')).read()
 
 requires = [
Index: wflow-py/wflow/__init__.py
===================================================================
diff -u -rba069312be282e584731f4e7fb3d2ee1277e497e -rca550c98b8b75a453fe2ff806ab92a6595d146a6
--- wflow-py/wflow/__init__.py	(.../__init__.py)	(revision ba069312be282e584731f4e7fb3d2ee1277e497e)
+++ wflow-py/wflow/__init__.py	(.../__init__.py)	(revision ca550c98b8b75a453fe2ff806ab92a6595d146a6)
@@ -1,8 +1,4 @@
 __all__ = ["wflow_funcs","wflow_adapt","wflow_lib","pcrut","wf_DynamicFramework","stats"]
-__version__="1.0-fin"
-__release__="1.0-RC8-fin-203-210"
-
-import sys
-
-if not 'sphinx' in sys.modules:
-	import osgeo.gdal as gdal
\ No newline at end of file
+__version__="2015.01"
+__release__="2015.01.a1"
+import osgeo.gdal as gdal
\ No newline at end of file