Index: wflow-py/_version.py
===================================================================
diff -u -r834be6381f328109617a1ad55baf3f1fda9a874a -r1cdd62a662d773814de95ff9b220d4c6532339c5
--- wflow-py/_version.py	(.../_version.py)	(revision 834be6381f328109617a1ad55baf3f1fda9a874a)
+++ wflow-py/_version.py	(.../_version.py)	(revision 1cdd62a662d773814de95ff9b220d4c6532339c5)
@@ -1,4 +1,4 @@
-VERSION="1.0.master.1"
+# This file is made by mkversion_buildserver.py, do not edit!VERSION="1.0.master.1"
 MVERSION="1.0.master"
 NVERSION="1.0.1"
-BUILD="2017-05-23 08:34:15.293000"
+BUILD="2017-06-01 15:37:12.049000"
Index: wflow-py/mkversion_buildserver.py
===================================================================
diff -u -r011d77248753904e20ba493bf45944729ac2c8ee -r1cdd62a662d773814de95ff9b220d4c6532339c5
--- wflow-py/mkversion_buildserver.py	(.../mkversion_buildserver.py)	(revision 011d77248753904e20ba493bf45944729ac2c8ee)
+++ wflow-py/mkversion_buildserver.py	(.../mkversion_buildserver.py)	(revision 1cdd62a662d773814de95ff9b220d4c6532339c5)
@@ -25,7 +25,7 @@
 
 build=datetime.datetime.now()
 
-a.write("# This file is made by mkversion.py, do not edit!")
+a.write("# This file is made by mkversion_buildserver.py, do not edit!")
 a.write("VERSION=\"" + manualversion +  "\"\n")
 a.write("MVERSION=\"" + manualmainversion +"\"\n")
 a.write("NVERSION=\"" + version +"\"\n")
@@ -47,6 +47,8 @@
 a.write("    os.environ['PATH'] = _ROOT + ';' + os.environ['PATH']\n")
 a.write("    os.environ['PYTHONPATH'] = _ROOT + ';' + os.environ['PYTHONPATH']\n")
 a.write("    sys.path.insert(0,_ROOT)\n")
+a.write("    if _ROOT not in os.environ['PATH']:\n")
+a.write("        print('Root dir of binary not in system path. This may cause problems...')\n")
 a.write("else:\n")
 a.write("    _ROOT = os.path.abspath(os.path.dirname(__file__))\n\n")
 a.write("import osgeo.gdal as gdal\n\n")
Index: wflow-py/wflow/__init__.py
===================================================================
diff -u -r412ef230eb57e0be0f5393b3f2fe8efca74d9d4f -r1cdd62a662d773814de95ff9b220d4c6532339c5
--- wflow-py/wflow/__init__.py	(.../__init__.py)	(revision 412ef230eb57e0be0f5393b3f2fe8efca74d9d4f)
+++ wflow-py/wflow/__init__.py	(.../__init__.py)	(revision 1cdd62a662d773814de95ff9b220d4c6532339c5)
@@ -2,21 +2,21 @@
 __version__="1.0.master"
 __release__="1.0.master.1"
 __versionnr__="1.0.1"
-__build__="2017-05-23 08:34:15.293000"
-
-
-import osgeo.gdal as gdal
-
+__build__="2017-06-01 15:37:12.049000"
 import os, sys
 if hasattr(sys, "frozen"):
-    print("wflow: frozen")
+    print('Frozen...')
     _ROOT = os.path.abspath(os.path.dirname(__file__)).split("library.zip")[0]
     os.environ['GDAL_DATA'] = os.path.join(_ROOT,'gdal-data')
-    _ROOT = os.path.abspath(os.path.dirname(__file__)).split("library.zip")[0]
-    os.environ['PATH'] = os.environ['PATH'] + ";" + os.path.join(_ROOT)
+    os.environ['PATH'] = _ROOT + ';' + os.environ['PATH']
+    os.environ['PYTHONPATH'] = _ROOT + ';' + os.environ['PYTHONPATH']
+    sys.path.insert(0,_ROOT)
+    if _ROOT not in os.environ['PATH']:
+        print('Root dir of binary not insystem path. This may cause problems...')
 else:
-    print("wflow: python")
     _ROOT = os.path.abspath(os.path.dirname(__file__))
 
+import osgeo.gdal as gdal
+
 def get_data(path):
     return os.path.join(_ROOT, 'data', path)