Issue 1: Big Refactoring of the code
Authored by: tchule@hotmail.com 2012-12-24
Parent: [r152]
Child: [r154]
