updated and renamed library
Merge branch 'release/r2'