Fix author list.
Fix typo.
Automatic Py3k merge for testing