Close #4 accepting @HugoGiraudel proposition