Storage file and directory
Merge branch 'develop' of https://github.com/borislav-angelov/storage-factory into develop