Merge pull request #4 from paregorios/master

respond to some student suggestions and comply with funder policy