Integrate code and update change log