Bugfix to check the url first before determining the root-element
Merge remote-tracking branch 'origin/master'