Rewritten checks to be done by service, added notification
Merge pull request #1 from tsagi/master

Rewritten checks to be done by service, added notification