diff --git a/orekit-conda-recipe/CHANGES.txt b/orekit-conda-recipe/CHANGES.txt
index efcc8c9e7157e72cfa86aad4f7bb9edb72fc0455..05e8c31f6c1e2f381173b0ecae09a9a300dca649 100644
--- a/orekit-conda-recipe/CHANGES.txt
+++ b/orekit-conda-recipe/CHANGES.txt
@@ -1,5 +1,13 @@
 Changelog python orekit package
 
+2015-10-05 Version 7.1dev Build 1
+- Updated to apache common math 3.6
+- Orekit 7.1dev version from repository
+
+2015-05-18 Version 7.1dev Build 0
+- Updated to apache common math 3.5
+- Orekit 7.1dev version from repository (including bugfix for events)
+
 2014-12-29 Version 7.0 Build 1
 - Based on orekit 7.0 and apache commons math 3.4
 - Updated wrappers based on new architecture
diff --git a/orekit-conda-recipe/bld.bat b/orekit-conda-recipe/bld.bat
index cdf5c3caa118e7ba3d1bcff4446f2455847595b8..44f9206edd51c8f20f483f4d0a508c759ab7bbd0 100644
--- a/orekit-conda-recipe/bld.bat
+++ b/orekit-conda-recipe/bld.bat
@@ -1,14 +1,14 @@
 
-
+set
 
 
 
 "%PYTHON%" -m jcc  ^
 --use_full_names ^
 --python orekit ^
---version 7.0.0 ^
---jar %RECIPE_DIR%\orekit-7.0.jar ^
---jar %RECIPE_DIR%\commons-math3-3.4.1.jar ^
+--version 7.1.dev ^
+--jar %RECIPE_DIR%\orekit-7.1-SNAPSHOT.jar ^
+--jar %RECIPE_DIR%\commons-math3-3.6-SNAPSHOT.jar ^
 --package java.io ^
 --package java.util ^
 --package java.text ^
@@ -47,9 +47,36 @@ java.text.DecimalFormatSymbols ^
 
 if errorlevel 1 exit 1
 
-:: Add more build steps here, if they are necessary.
+:: Add PATH to anaconda java-jdk / jre
+
+echo import os > header.txt
+echo os.environ["PATH"] = r"%PREFIX%\Library\jre\bin\server" + os.pathsep + os.environ["PATH"] >> header.txt
 
+IF "%ARCH%"=="32" (
+    ::win32 ARCH == 32
+    type %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.py >> header.txt
+    del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.py
+    del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.pyc
+    ren header.txt __init__.py
+    move __init__.py %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\
+)
+
+IF "%ARCH%"=="64" (
+    ::amd64
+    type %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.py >> header.txt
+    del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.py
+    del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.pyc
+    ren header.txt __init__.py
+    move __init__.py %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\
+)
 
 :: See
 :: http://docs.continuum.io/conda/build.html
 :: for a list of environment variables that are set during the build process.
+
+::amd64
+::type %SP_DIR%\orekit-7.0.0-py2.7-win-amd64.egg\orekit\__init__.py >> header.txt
+::del %SP_DIR%\orekit-7.0.0-py2.7-win-win32.egg\orekit\__init__.py
+::del %SP_DIR%\orekit-7.0.0-py2.7-win-win32.egg\orekit\__init__.pyc
+::ren header.txt __init__.py
+::move __init__.py %SP_DIR%\orekit-7.0.0-py2.7-win-win32.egg\orekit\
diff --git a/orekit-conda-recipe/build.sh b/orekit-conda-recipe/build.sh
index 9220e8efb3362005d310e59c74e9925a73f2ee7d..ca898deadb200a225a59be4a1ecbaf03e914dfa6 100644
--- a/orekit-conda-recipe/build.sh
+++ b/orekit-conda-recipe/build.sh
@@ -6,9 +6,9 @@
 $PYTHON -m jcc \
 --use_full_names \
 --python orekit \
---version 7.0.0 \
---jar $RECIPE_DIR/orekit-7.0.jar \
---jar $RECIPE_DIR/commons-math3-3.4.1.jar \
+--version 7.1.dev \
+--jar $RECIPE_DIR/orekit-7.1-SNAPSHOT.jar \
+--jar $RECIPE_DIR/commons-math3-3.5.jar \
 --package java.io \
 --package java.util \
 --package java.text \
diff --git a/orekit-conda-recipe/commons-math3-3.4.1.jar b/orekit-conda-recipe/commons-math3-3.4.1.jar
deleted file mode 100644
index cf9f519fb1780ffbb04ac4902abc22a5e609f3c4..0000000000000000000000000000000000000000
Binary files a/orekit-conda-recipe/commons-math3-3.4.1.jar and /dev/null differ
diff --git a/orekit-conda-recipe/commons-math3-3.6-SNAPSHOT.jar b/orekit-conda-recipe/commons-math3-3.6-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6e3a0f4490a541ee96adcb121fed4fff70d5b03e
Binary files /dev/null and b/orekit-conda-recipe/commons-math3-3.6-SNAPSHOT.jar differ
diff --git a/orekit-conda-recipe/meta.yaml b/orekit-conda-recipe/meta.yaml
index 8a2b25dfbe3bf699f4a27d08c97f97947d1a387c..0f71a287a5259edf004d9f8a6cb39866afbfcae9 100644
--- a/orekit-conda-recipe/meta.yaml
+++ b/orekit-conda-recipe/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: orekit
-  version: '7.0'
+  version: '7.1.dev0'
 
 #source:
 #  fn: orekit-6.1.jar
@@ -24,7 +24,12 @@ build:
   # number. If you do not include this key, it defaults to 0.
   number: 1
   # Builds:
-  # 1 - orekit 7.0 development version
+  # 1 - orekit 7.1dev0 version from git 2015-10-05
+
+
+
+  #has_prefix_files:
+  #      Lib/site-packages/orekit/__init__.py
 
 
 requirements:
@@ -35,8 +40,9 @@ requirements:
 
   run:
     - python
-    - jcc 2.21
-    - setuptools
+    #- java-jdk [win]
+    #- jcc 2.21
+    #- setuptools
 
 test:
   # Python imports
@@ -74,11 +80,12 @@ test:
 
   requires:
     # Put any additional test requirements here.  For example
-    - orekit
-    - jcc
+    #- orekit
+    #- jcc
+    #- java-jdk [win]
 
 about:
-  home: hhttps://www.orekit.org/
+  home: https://www.orekit.org/
   license: Apache Software License
 
 # See
diff --git a/orekit-conda-recipe/orekit-7.0.jar b/orekit-conda-recipe/orekit-7.0.jar
deleted file mode 100644
index 116272621dc85862d7926b38eb0aca3ac83d5c88..0000000000000000000000000000000000000000
Binary files a/orekit-conda-recipe/orekit-7.0.jar and /dev/null differ
diff --git a/orekit-conda-recipe/orekit-7.1-SNAPSHOT.jar b/orekit-conda-recipe/orekit-7.1-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5c032864e6f4ddddc2c340b4ecc1976beacdfc99
Binary files /dev/null and b/orekit-conda-recipe/orekit-7.1-SNAPSHOT.jar differ
diff --git a/orekit-conda-recipe/test/NodeDetectorTest.py b/orekit-conda-recipe/test/NodeDetectorTest.py
index 9f6d3d54c7269bcdd7c3a88ac77602f6c67d324c..d9a8f69a230435b9b7c2fb203722eb9e4c6eb32b 100644
--- a/orekit-conda-recipe/test/NodeDetectorTest.py
+++ b/orekit-conda-recipe/test/NodeDetectorTest.py
@@ -55,7 +55,7 @@ v = 0.0;
 
 inertialFrame = FramesFactory.getEME2000()
 initialDate = AbsoluteDate(2014, 01, 01, 0, 0, 0.0, TimeScalesFactory.getUTC())
-finalDate = initialDate.shiftedBy(5000.0)
+finalDate = initialDate.shiftedBy(70*24*60*60.0)
 initialOrbit = KeplerianOrbit(a, e, i, w, raan, v, PositionAngle.TRUE, inertialFrame, initialDate, Constants.WGS84_EARTH_MU)
 initialState = SpacecraftState(initialOrbit, 1000.0)
 
@@ -86,8 +86,8 @@ propagator.addEventDetector(node2);
 propagator.setEphemerisMode();
 propagator.propagate(finalDate);
 
-assert 2==logger1.getLoggedEvents().size()
-assert 2== logger2.getLoggedEvents().size();
+assert 1998==logger1.getLoggedEvents().size()
+assert 1998== logger2.getLoggedEvents().size();
 logger1.clearLoggedEvents();
 logger2.clearLoggedEvents();
 
@@ -97,7 +97,7 @@ postpro = propagator.getGeneratedEphemeris();
 postpro.addEventDetector(node1);
 postpro.addEventDetector(node2);
 postpro.propagate(finalDate);
-assert 2==logger1.getLoggedEvents().size()
-assert 2==logger2.getLoggedEvents().size()
+assert 1998==logger1.getLoggedEvents().size()
+assert 1998==logger2.getLoggedEvents().size()
 
 print "NodeDetectorTest Successfully run"