modified some files
Merge remote-tracking branch 'gcqc/master'