Close #1316

And colorize (? too.