Issue 1: Refactoring of the code
Authored by: tchule@hotmail.com 2012-12-29
Parent: [r160]
Child: [r162]
