Code conventions
Merge branch 'master' of https://github.com/NAH1/A5