Merge pull request #489 from TheBlueMatt/2020-02-chan-updates