[*]deletion
Merge branch 'feature'