Extended for #68 headers - fixed #75