Trunk synchronized with branch 3
Duplicated Code and Comments
Code Smell - Duplicated Code
open -> closed
Code Smell - Comments