Fix to R_HOME paths on windows and linux
Merge branch 'development'