Merge pull request #55 from mbjoseph/header-includes

Adding a header-includes option