Modified readme
Merge from master