Changelog/thanks (fix #1004, #1008)