fixed issues
Merge remote-tracking branch 'origin/master' into R-1.0