Update changelog and Fixes #582