Location Header logic, partially fixes #66