Close #2 accepting @HugoGiraudel proposition