Feature/mgamboa/2014 25 08/graphs