Merge "Fix whitespace issues in readme" into dev-b