Merge pull request #108 from jsilvestre/master

Various changes
Merge pull request #111 from jsilvestre/master

Fixes previous PR
Fixed: files were not taken into account when detecting if folder was empty or not in public area. CLose #114