505c3c8 add bex's suggestions

Authored and Committed by Sumantro Mukherjee a year ago
    add bex's suggestions