Merge pull request #2 from cgrevisse/master

Merge pull request #7 from gneyens/master
Table highlighting
Merge pull request #8 from gneyens/master

Table highlighting