Fixed headers #7 ; close issue #7