20141125

20141125 changes by zzhang