pull request from anne

Here is your pull request - see inline comments.