Improved notification building
Merge pull request #68 from maxirosson/dev

Improved notification building