added bylines
Merge branch 'master' into temp
edits