Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
improve for R 3.0
Merge branch 'master' into develop