Add baseurl option and fix some links
Merge branch 'Development'