merge some changes form dev