Updated readme
Merged branch