Added site.url instead of relying on root
Fixed merge conflict from #11