Merge pull request #625 from HelenCampbell/rprep