Merge pull request #462 from ariard/2020-01-refactor-chan