updates to author list
Merge remote-tracking branch 'upstream/master'
Merge pull request #96 from ehsteve/master

More updates