Issue #124

For issue #124 
@jkburges I'd appreciate your feedback on the wording here