tried to fix header row bug, unsucessful
Merge remote-tracking branch 'upstream/master'
need to merge