updated readme
merged master