Improve highlighting of function calls
Merge pull request #9 from ashmoran/master

Improve highlighting of function calls