Fixed Delete bug
Merge branch 'Issue#5' into dev_1.0