resolving the path error for /html files
Merge remote-tracking branch 'upstream/master'