diff --git a/apps/gipy/ChangeLog b/apps/gipy/ChangeLog
index d9fde597b..3b0d62009 100644
--- a/apps/gipy/ChangeLog
+++ b/apps/gipy/ChangeLog
@@ -62,3 +62,4 @@
 0.15:
 	* Record traveled distance to get a good average speed.
 	* Breaks (low speed) will not count in average speed.
+	* Bugfix in average speed.
diff --git a/apps/gipy/README.md b/apps/gipy/README.md
index f7fd04233..07f5dcca4 100644
--- a/apps/gipy/README.md
+++ b/apps/gipy/README.md
@@ -1,11 +1,34 @@
 # Gipy
 
-Development still in progress. Follow compressed gpx traces.
-Will warn you before reaching intersections and try to turn off gps.
+Gipy allows you to follow gpx traces on your watch.
+
+It is meant for bicycling and not hiking
+(it uses your movement to figure out your orientation).
+
+It provides the following features :
+
+- display the path with current position from gps
+- detects and buzzes if you leave the path
+- buzzes before sharp turns
+- buzzes before nodes with comments
+(for example when you need to turn in https://mapstogpx.com/)
+- display instant / average speed
+- display distance to next node
+
+optionally it can also :
+
+- display additional data from openstreetmap :
+    - water points
+    - toilets
+    - artwork
+    - bakeries
+
+- try to turn off gps between crossroads to save battery
 
 ## Usage
 
-WIP.
+You first need to convert your .gpx file to a .gpc (our custom lightweight trace).
+Then launch gipy and select a trace to follow.
 
 
 ## Creator
diff --git a/apps/gipy/app.js b/apps/gipy/app.js
index b97716604..ae82e5dfb 100644
--- a/apps/gipy/app.js
+++ b/apps/gipy/app.js
@@ -4,7 +4,7 @@ let code_key = 47490;
 
 var settings = Object.assign(
   {
-    keep_gps_alive: false,
+    keep_gps_alive: true,
     max_speed: 35,
   },
   require("Storage").readJSON("gipy.json", true) || {}
@@ -75,10 +75,9 @@ class Status {
     let last_point = this.old_points[this.old_points.length - 1];
     let oldest_point = this.old_points[0];
 
-    // every 8 points we count the distance
-    if (this.gps_coordinates_counter % 8 == 0) {
+    // every 7 points we count the distance
+    if (this.gps_coordinates_counter % 7 == 0) {
       let distance = last_point.distance(oldest_point);
-      console.log(distance);
       if (distance < 150.0) {
         // to avoid gps glitches
         this.advanced_distance += distance;