Minor edits
Merge commit 'b7f0b8124d5882301ce34c99604685d552070265'