header allow cache
#104
Merge remote-tracking branch 'upstream/master'