Code optimizations
Merge branch 'master' of github.com:Brolik/URL-Builder