Merge pull request #152 from fahadhatib/develop

Bring code into line with the coding guidelines