Merge branch 'README-refactor'