accept pull req from rodsenra partially
make it simple
add acknowledgment
Merge branch 'rodsenra-pr'