add few lines including bugs
bug of master fixed