nicer recipients
set error recipients
Merge branch 'develop'