More Services Fixes
Merge pull request #33 from mauricio-gamboa/feature/mgamboa/2014-10-18/more-services

More Services Fixes