Just a comment!
allow for subdirs in urls
Merge remote-tracking branch 'origin/master'