PIMP MY HEADERS

closes issue #2