fix remarks for PR #209

Only commit c004530 matters, rest is sync with current master.