Merge branch 'hotfix/bugs'
Fixed error reporting by email
Merge branch 'hotfix/bugs' into develop