Move to R version 3.1.1
Merging some changes