Feature/mgamboa/2014 09 15/home