fix email address
Merge remote-tracking branch 'origin/master' into field_converters
add author