fixed location
fixed comments
Merge pull request #784 from Ragazzo/location_header_issue

fixed location