Merged CHANGELOG and altered version