updated readme
updated readme
updated readme
merged from master