Merge pull request #524 from jacklenox/dev

Capitalisation and coding standards corrections - props @jacklenox