Merge pull request #2 from emocentmagar/krazz

code reduced
added service