Merge pull request #246 from timschofield/develop

Initialise counter
Fix table headers to abide by the coding guidelines
Merge pull request #247 from MarthaMadjack/develop

Fix table headers to abide by the coding guidelines