and a changelog
preparing to merge