Fix document root
Fix to url
Merge branch 'sharils' into wip