Merge branch 'RB' into README-refactor