merge the master from ctiao

merge the new commits