Added header modification capability
Update ChangeLog
Merge to 2.2.2