Fix email
Merge branch 'development'