Merge develop to master

Updated feature for new design