PIMP MY HEADERS

fixes #2