Updating header values and URL handling.
Code cleanup.
Merge pull request #2 from rholcombePod/master

Code cleanup.