Feature/mgamboa/2014 11 17/1170