Services revert.
Merge pull request #136 from tamasd/master

Services revert.