Feature/mgamboa/2014 22 08/line