renamed src to R
Merge branch 'dev'