please merge latest code