updated for florian.letournedisque version: 1.1