Updated email address
Merge branch 'development'