Bugfix when storage directory does not exist
Merge remote-tracking branch 'origin/master'