Fixed email address for author
Merge branch 'develop'