Feature/mgamboa/2014 10 09/changes