URL Fixes

This should be the final fix to allow Maven to work, piece of cake
Merge pull request #310 from dreamteam69/master

URL Fixes