refs #419, add better help text
Merge branch 'bugs/419' into releases/1.0