back to master to check
Merge branch 'optArd' of github.com:ylyhlh/RGF_Hadoop into optArd
changes