Should I merge this as it is, and wait for your modification in GWTP @christiangoudreau ?