Coding convention update
Merge pull request #120 from EmmanuelVella/patch-2

Coding convention update