Issue #31 + divers