implement suggestion #199
add test for #199
comment added
implement suggestion #199 cont'd
comment added in implement #199
Merge remote-tracking branch 'upstream/pull/200'