Add filter to highlight # and linkify @ tags
Merge remote-tracking branch 'origin/master'