Removed mail address
Merge branch 'development'