added header highlighting, possibly for more than two choices in the future
Merge remote-tracking branch 'origin/master'