Merge pull request #1 from timothycommoner/master

Tim's last changes