notification is ok for test, not embeded to code
Merge branch 'master' into production