Some small modifications
Updated CHANGELOG
Updated CHANGELOG