Fixed the location header expect to use && instead of ||
Merge pull request #1 from andymoon/master

Fixed the location header expect to use && instead of ||