Feature/mgamboa/2014 10 06/bugs