merge Develop to master

updated feature for new design