added del function
Merge branch 'dev'