Merging #24 from @HugoGiraudel .