iteration 3 code analysis
Merge remote-tracking branch 'origin/iter3-codeAnalysis' into development