Added better building of urls
Merge pull request #26 from kpartlow/master

Added better building of urls