delete functionality
Merge branch 'dev'