update to zhaozhang/v-1.1-d