conficts
correction of README
Merge branch 'README-polish'