Merge branch 'release_branch' into dev

Author: SabineHaas

example/modelchain_example.py

@@ -1,6 +1,10 @@
 """
 The ``modelchain_example`` module shows a simple usage of the windpowerlib by
-using the :class:`~.modelchain.ModelChain` class.
+using the :class:`~.modelchain.ModelChain` class. The modelchains are
+implemented to ensure an easy start into the Windpowerlib. They work like
+models that combine all functions provided in the library. Via parameteres
+desired functions of the windpowerlib can be selected. For parameters not being
+specified default parameters are used.
 
 There are mainly three steps. First you have to import your weather data, then
 you need to specify your wind turbine, and in the last step call the

setup.py

@@ -5,7 +5,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 setup(name='windpowerlib',
-      version='0.0.6',
+      version='0.1.0',
       description='Creating time series from wind power plants.',
       url='http://github.com/wind-python/windpowerlib',
       author='oemof developing group',

windpowerlib/__init__.py

@@ -1,6 +1,6 @@
 __copyright__ = "Copyright oemof developer group"
 __license__ = "GPLv3"
-__version__ = '0.0.6'
+__version__ = '0.1.0'
 
 from windpowerlib.wind_turbine import WindTurbine
 from windpowerlib.wind_farm import WindFarm