Fixes #1
Fixed times, added header
Fixed merge issue