Feature/mgamboa/2014 07 01/help