Feature/mgamboa/2014 08 13/services