Added UML diagram
Added coding styles to README
Merge branch 'master' into code
Merge remote branch 'origin/master'