merge update 130421

merge update 130421