Fixes #114; possible/temp fix for #117; better wording