merge fixed bugs 130516

merge fixed bugs 130516