Issue #86 Added Cache-Control header
Merge pull request #98 from carlosmiranda/86

#98: pull request Issue #86 Added Cache-Control header
Merge remote-tracking branch 'origin/master' into 96
Issue #96 Fixed annotation style error