1. header improvements
Merge pull request #8 from dhirajbodicherla/master

1. header improvements