Carlos Tejo - 2012-12-10

Attached preliminar patch