More URL fixes.
Merge pull request #8 from thedereck/Even-More-URL-Fixes

More URL fixes.
Merge pull request #9 from thedereck/master

More URL Fixes.