issue #10 and tests changes accordingly
issue #24 - set in headers
Merge pull request #27 from georgebyelas/master

issue #10 and tests changes accordingly