Fixed bug in delete
Merge branch 'develop'