Fix home page again
Fixed directive watcher and exclude_self
Merge remote-tracking branch 'origin/master'