Merge branch 'master' into author_nadrow
updated author order
abstract
Merge branch 'author_nadrow'