Gpii 878

http://issues.gpii.net/browse/GPII-878
@jobara I did a new commit about the indentation.