modified comments
merged from master