Todd's update
Merge pull request #3 from todd/todds_update

Hi