Prepared readme
Merge conflicts
Merge conflicts