merged to latest code

latest code