Service Fix
Merge pull request #2 from Lunatixz/master

Service Fix