normalized white space
merged with master