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