Yl dev1226

repair bugs :#7 #8    @shenhao999