Check for folders before deleting
Merge pull request #196 from heeton/master

Check for folders before deleting