Merge pull request #1 from tpoisot/master

Tim's latest version
edits from DBS
typos in the title are particularly embarrassing
Merge pull request #4 from stouffer/master

edits from DBS