GH #221 - Fixed passing headers on to base classes.
Merge branch 'dsuch-b-gh221-client-headers'