merge minor changes
pull code merge