Merge pull request #1245 from danweller18/feature_js_headers