[#66300368] updated with feedback from Sarah
Merge pull request #55 from gengo/sarah-edits2

[#66300368] updated with feedback from Sarah
Travis build 258