If 'demo-file-storage' is set, but 'demo-storage' is off, do not raise an exception
Merge pull request #15 from frapell/master

If 'demo-file-storage' is set, but 'demo-storage' is off, do not raise an Exception