Issue 1: Refactoring of the code
Authored by: tchule@hotmail.com 2012-12-20
Parent: [r147]
Child: [r149]
