Feature/r wrapper