Stuart's late edits
Merge pull request #1368 from juneb/juneb_130524

Stuart's late edits