Add author email
Merged justi's changes...again ;)