Update README

MODULES-1582 change, MODULES-444 change and Whitespace fixes