Update History List
Merge remote-tracking branch 'origin/andy'