Fix vim i issue
Update ChangeLog