Merge https://github.com/Mullefa/r2scala
Merge branch 'master' of https://github.com/Mullefa/r2scala