merging feature in to dev

merging feature branch in to dev branch