delete function
Merge branch 'keris'