Delete works
fixed small bug
Merge branch 'master' into varun