Readme updated, merge from master