Fix #10 Imrove header