Merge pull request #14 from kav2k/notification

Improving notifications