Close #1 accepting @HugoGiraudel proposition