Add headers option and accompanying test

closes #7