Feature/mgamboa/2014 08 18/home