Improve notification
Merge branch 'development'