1. Added new code for deleting directory.
2. Used mkdir instead of mkdirs for automatically creating parents
Merge remote-tracking branch 'origin/master'