Improve delete service
Merge pull request #26 from veewee/improveme-delete-service

Improve delete service