merging in dev

merge done