Add highlighting on pipe and period token
Merge remote branch 'origin/master'