removed trailing spaces
merged from develop