Update to EF6
Fix logic for storages
Merge pull request #7 from ernado-x/v1.9.5

V1.9.5