Trying the pull request

Kevin, 

When you have time, see whether you want to review the changes I made.