Merge pull request #683 from HelenCampbell/rpreppy