minor changes
merged from master