Feature/mgamboa/2014 10 19/fixes