Issue 1: Refactoring of the code
Authored by: tchule@hotmail.com 2012-12-21
Parent: [r148]
Child: [r150]