Merge pull request #1 from NJUOPEN/master

20141018, Stage 2/1